From 7530892b4ada154485962b6c376af6725c3ba638 Mon Sep 17 00:00:00 2001 From: David Hummel <6109326+hummeltech@users.noreply.github.com> Date: Thu, 20 Jun 2024 20:02:26 -0700 Subject: [PATCH 001/192] apacheHttpdPackages.mod_tile: 0.7.1 -> 0.7.2 --- .../http/apache-modules/mod_tile/default.nix | 9 ++----- .../mod_tile/mod_tile-std_optional.patch | 26 ------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 6c64478cc125..1f86587c7d1c 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -20,20 +20,15 @@ stdenv.mkDerivation rec { pname = "mod_tile"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "mod_tile"; rev = "refs/tags/v${version}"; - hash = "sha256-zXUwTG8cqAkY5MC1jAc2TtMgNMQPLc5nc22okVYP4ME="; + hash = "sha256-JC275LKsCeEo5DcIX0X7kcLoijQJqfJvBvw8xi2gwpk="; }; - patches = [ - # Support Mapnik >= v4.0.0-rc2 (boost:optional no longer used) - ./mod_tile-std_optional.patch - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch b/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch deleted file mode 100644 index 1f63ce0bc1f1..000000000000 --- a/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e68d2e9..ddba150 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,7 +48,7 @@ find_package(LIBMEMCACHED) - find_package(LIBRADOS) - - if(LIBMAPNIK_VERSION STRGREATER_EQUAL "4") -- set(CMAKE_CXX_STANDARD 14) -+ set(CMAKE_CXX_STANDARD 17) - endif() - - # Programs -diff --git a/src/parameterize_style.cpp b/src/parameterize_style.cpp -index 8db7122..7100735 100644 ---- a/src/parameterize_style.cpp -+++ b/src/parameterize_style.cpp -@@ -72,7 +74,7 @@ static void parameterize_map_language(mapnik::Map &m, char * parameter) - mapnik::parameters params = l.datasource()->params(); - - if (params.find("table") != params.end()) { -- boost::optional table = params.get("table"); -+ auto table = params.get("table"); - - if (table && table->find(",name") != std::string::npos) { - std::string str = *table; From 942de9aafb51f31f63f9512d77208b3a76ad87bd Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Fri, 18 Oct 2024 13:31:14 -0700 Subject: [PATCH 002/192] google-play: init at 1.5.8 --- pkgs/by-name/go/google-play/package.nix | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/go/google-play/package.nix diff --git a/pkgs/by-name/go/google-play/package.nix b/pkgs/by-name/go/google-play/package.nix new file mode 100644 index 000000000000..4dece9445825 --- /dev/null +++ b/pkgs/by-name/go/google-play/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule rec { + pname = "google-play"; + version = "1.5.8"; + + src = fetchFromGitHub { + owner = "3052"; + repo = "google"; + rev = "v${version}"; + hash = "sha256-viAqy/vFbkzW45oCUd3kvkR/8BzPYe/XdPJEpeSmcY0="; + }; + + subPackages = [ + "internal/play" + "internal/badging" + ]; + + vendorHash = "sha256-C04/LcTcXaVzl74cTJBIZT+1mBw+cmOT8TllWIm4Jt4="; + + meta = { + description = "CLI app to download APK from Google Play or send API requests"; + maintainers = with lib.maintainers; [ ulysseszhan ]; + # https://polyformproject.org/licenses/noncommercial/1.0.0 + license = lib.licenses.unfree; + homepage = "https://github.com/3052/google"; + mainProgram = "play"; + platforms = lib.platforms.unix; + }; +} From efb30c73fc33e601334882b3c81befd83b26e5fa Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Sat, 2 Nov 2024 20:49:51 +0200 Subject: [PATCH 003/192] patchance: fix pipewire-jack compatibility --- pkgs/applications/audio/patchance/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/patchance/default.nix b/pkgs/applications/audio/patchance/default.nix index 86e1d2745b96..a1b39b1d78a3 100644 --- a/pkgs/applications/audio/patchance/default.nix +++ b/pkgs/applications/audio/patchance/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { installFlags = [ "PREFIX=$(out)" ]; makeWrapperArgs = [ - "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ]) + "--suffix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ]) ]; preFixup = '' From 157f77fc2861de89e890b2621db70c1f5cc9e77d Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Sat, 2 Nov 2024 20:50:18 +0200 Subject: [PATCH 004/192] raysession: fix pipewire-jack compatibility --- pkgs/applications/audio/raysession/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix index 61051f79b376..375c5d3d646c 100644 --- a/pkgs/applications/audio/raysession/default.nix +++ b/pkgs/applications/audio/raysession/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { installFlags = [ "PREFIX=$(out)" ]; makeWrapperArgs = [ - "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ]) + "--suffix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ]) ]; postFixup = '' From e36c592733b2928e7b6d3d33782a383e1d49d173 Mon Sep 17 00:00:00 2001 From: Louis Thevenet Date: Sat, 9 Nov 2024 11:35:53 +0100 Subject: [PATCH 005/192] vault-tasks: init at 0.4.0 --- pkgs/by-name/va/vault-tasks/package.nix | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/va/vault-tasks/package.nix diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix new file mode 100644 index 000000000000..a2fe3177c89e --- /dev/null +++ b/pkgs/by-name/va/vault-tasks/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "vault-tasks"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "louis-thevenet"; + repo = "vault-tasks"; + rev = "v${version}"; + hash = "sha256-owpdBkJwSTLtRhPdQMybZpfrZyww1zwFIydFdZb76Uo="; + }; + cargoHash = "sha256-7AZItl459Gsqd6I5MNhJm6cH7Oze3wCsejJGztPSICw="; + + postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications"; + + meta = { + description = "TUI Markdown Task Manager"; + longDescription = '' + vault-tasks is a TUI Markdown task manager. + It will parse any Markdown file or vault and display the tasks it contains. + ''; + homepage = "https://github.com/louis-thevenet/vault-tasks"; + license = lib.licenses.mit; + mainProgram = "vault-tasks"; + maintainers = with lib.maintainers; [ louis-thevenet ]; + }; +} From 8ce2f1475dc70e3f838ee9be02e286c2a37f8bf1 Mon Sep 17 00:00:00 2001 From: Jacek Generowicz Date: Tue, 23 Apr 2024 13:34:14 +0200 Subject: [PATCH 006/192] cbmc-viewer: init at 3.8 --- pkgs/by-name/cb/cbmc-viewer/package.nix | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/cb/cbmc-viewer/package.nix diff --git a/pkgs/by-name/cb/cbmc-viewer/package.nix b/pkgs/by-name/cb/cbmc-viewer/package.nix new file mode 100644 index 000000000000..a4e099092777 --- /dev/null +++ b/pkgs/by-name/cb/cbmc-viewer/package.nix @@ -0,0 +1,30 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonApplication rec { + pname = "cbmc-viewer"; + version = "3.8"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JFL06z7lJWZxTALovDBVwNJWenWPUQV9J0qZz3Ek6gI="; + }; + + propagatedBuildInputs = with python3Packages; [ + setuptools + jinja2 + voluptuous + ]; + + meta = { + description = "Produces browsable summary of CBMC model checker output"; + homepage = "https://github.com/model-checking/cbmc-viewer"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jacg ]; + mainProgram = "cbmc-viewer"; + }; +} From e79dda5d893f8abca1f0e368a0f919a4a08b186f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 10 Nov 2024 03:57:05 +0400 Subject: [PATCH 007/192] open62541pp: init at 0.15.0 --- pkgs/by-name/op/open62541pp/package.nix | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/op/open62541pp/package.nix diff --git a/pkgs/by-name/op/open62541pp/package.nix b/pkgs/by-name/op/open62541pp/package.nix new file mode 100644 index 000000000000..4d8e946cac70 --- /dev/null +++ b/pkgs/by-name/op/open62541pp/package.nix @@ -0,0 +1,40 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + open62541, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "open62541pp"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "open62541pp"; + repo = "open62541pp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6HQ8j23+xqJCOwCRK1GgNAoz/wXUBqdulfeQFFXSjEo="; + }; + + cmakeFlags = [ + (lib.cmakeBool "UAPP_INTERNAL_OPEN62541" false) + ]; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + open62541 + ]; + + meta = { + description = "C++ wrapper of the open62541 OPC UA library"; + homepage = "https://open62541pp.github.io/open62541pp"; + changelog = "https://github.com/open62541pp/open62541pp/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; + }; +}) From 206ebf249d58c202cd5abb2653bf84ab17b3483c Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sat, 9 Nov 2024 23:23:04 -0800 Subject: [PATCH 008/192] imewlconverter: init at 3.1.1 --- pkgs/by-name/im/imewlconverter/deps.nix | 21 +++++++++++++++ pkgs/by-name/im/imewlconverter/package.nix | 31 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/by-name/im/imewlconverter/deps.nix create mode 100644 pkgs/by-name/im/imewlconverter/package.nix diff --git a/pkgs/by-name/im/imewlconverter/deps.nix b/pkgs/by-name/im/imewlconverter/deps.nix new file mode 100644 index 000000000000..b4fd0f4ea255 --- /dev/null +++ b/pkgs/by-name/im/imewlconverter/deps.nix @@ -0,0 +1,21 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "CSharpier"; + version = "0.27.3"; + hash = "sha256-9g5WA+ii6ovKVGwpTaNIhs/Oti9YLwd//UhbNbBkn8E="; + }) + (fetchNuGet { + pname = "SharpZipLib"; + version = "1.4.2"; + hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; + }) + (fetchNuGet { + pname = "UTF.Unknown"; + version = "2.5.1"; + hash = "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4="; + }) +] diff --git a/pkgs/by-name/im/imewlconverter/package.nix b/pkgs/by-name/im/imewlconverter/package.nix new file mode 100644 index 000000000000..366700f9c416 --- /dev/null +++ b/pkgs/by-name/im/imewlconverter/package.nix @@ -0,0 +1,31 @@ +{ + fetchFromGitHub, + lib, + buildDotnetModule, + dotnetCorePackages, +}: + +buildDotnetModule { + pname = "imewlconverter"; + version = "3.1.1"; + src = fetchFromGitHub { + owner = "studyzy"; + repo = "imewlconverter"; + rev = "v3.1.1"; + hash = "sha256-lrYqQWh+PZreJ6oJg+OCipiqUyfG/2moP/n+jR+Kcj8="; + }; + + projectFile = "src/ImeWlConverterCmd/ImeWlConverterCmd.csproj"; + nugetDeps = ./deps.nix; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + + meta = { + mainProgram = "ImeWlConverterCmd"; + description = "FOSS program for converting IME dictionaries"; + homepage = "https://github.com/studyzy/imewlconverter"; + maintainers = with lib.maintainers; [ xddxdd ]; + license = lib.licenses.gpl3Only; + }; +} From 08151b58b32b900ff8e5c0d3a12dae16d216eb89 Mon Sep 17 00:00:00 2001 From: moni Date: Sun, 3 Nov 2024 07:06:49 +0800 Subject: [PATCH 009/192] libunicode: 0.4.0 -> 0.6.0 --- .../li/libunicode/package.nix} | 34 ++++++++++++++----- .../libunicode/remove-target-properties.diff | 19 +++++++++++ .../libunicode/remove-target-properties.diff | 19 ----------- pkgs/top-level/all-packages.nix | 15 ++++++-- 4 files changed, 56 insertions(+), 31 deletions(-) rename pkgs/{development/libraries/libunicode/default.nix => by-name/li/libunicode/package.nix} (58%) create mode 100644 pkgs/by-name/li/libunicode/remove-target-properties.diff delete mode 100644 pkgs/development/libraries/libunicode/remove-target-properties.diff diff --git a/pkgs/development/libraries/libunicode/default.nix b/pkgs/by-name/li/libunicode/package.nix similarity index 58% rename from pkgs/development/libraries/libunicode/default.nix rename to pkgs/by-name/li/libunicode/package.nix index 3fd47a9fc699..fdf88d026ab2 100644 --- a/pkgs/development/libraries/libunicode/default.nix +++ b/pkgs/by-name/li/libunicode/package.nix @@ -1,34 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, catch2, fmt, python3 }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchzip, + cmake, + catch2_3, + fmt, + python3, +}: let - ucd-version = "15.0.0"; + ucd-version = "16.0.0"; ucd-src = fetchzip { url = "https://www.unicode.org/Public/${ucd-version}/ucd/UCD.zip"; - hash = "sha256-jj6bX46VcnH7vpc9GwM9gArG+hSPbOGL6E4SaVd0s60="; + hash = "sha256-GgEYjOLrxxfTAQsc2bpi7ShoAr3up8z7GXXpe+txFuw"; stripRoot = false; }; -in stdenv.mkDerivation (final: { +in +stdenv.mkDerivation (final: { pname = "libunicode"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "libunicode"; rev = "v${final.version}"; - hash = "sha256-Us3T4fnGsArdsVB7IUhwdex43C+H1+lfL8yK9enhf2c="; + hash = "sha256-zX33aTQ7Wgl8MABu+o6nA2HWrfXD4zQ9b3NDB+T2saI"; }; # Fix: set_target_properties Can not find target to add properties to: Catch2, et al. patches = [ ./remove-target-properties.diff ]; - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ catch2 fmt ]; + nativeBuildInputs = [ + cmake + python3 + ]; + buildInputs = [ + catch2_3 + fmt + ]; cmakeFlags = [ "-DLIBUNICODE_UCD_DIR=${ucd-src}" ]; meta = with lib; { - description = "Modern C++17 Unicode library"; + description = "Modern C++20 Unicode library"; mainProgram = "unicode-query"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/by-name/li/libunicode/remove-target-properties.diff b/pkgs/by-name/li/libunicode/remove-target-properties.diff new file mode 100644 index 000000000000..bd5ae9f46481 --- /dev/null +++ b/pkgs/by-name/li/libunicode/remove-target-properties.diff @@ -0,0 +1,19 @@ +diff --git a/src/libunicode/CMakeLists.txt b/src/libunicode/CMakeLists.txt +index bb1a824..166834c 100644 +--- a/src/libunicode/CMakeLists.txt ++++ b/src/libunicode/CMakeLists.txt +@@ -235,10 +235,10 @@ if(LIBUNICODE_TESTING) + # supress conversion warnings for Catch2 + # https://github.com/catchorg/Catch2/issues/2583 + # https://github.com/SFML/SFML/blob/e45628e2ebc5843baa3739781276fa85a54d4653/test/CMakeLists.txt#L18-L22 +- set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF) +- set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF) +- get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) +- target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) ++ # set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF) ++ # set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF) ++ # get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) ++ # target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) + endif() + + target_link_libraries(unicode_test unicode Catch2::Catch2WithMain) diff --git a/pkgs/development/libraries/libunicode/remove-target-properties.diff b/pkgs/development/libraries/libunicode/remove-target-properties.diff deleted file mode 100644 index 4bf665cf3e7c..000000000000 --- a/pkgs/development/libraries/libunicode/remove-target-properties.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/libunicode/CMakeLists.txt b/src/libunicode/CMakeLists.txt -index 6c5ac20..9fa13a3 100644 ---- a/src/libunicode/CMakeLists.txt -+++ b/src/libunicode/CMakeLists.txt -@@ -223,10 +223,10 @@ if(LIBUNICODE_TESTING) - # supress conversion warnings for Catch2 - # https://github.com/catchorg/Catch2/issues/2583 - # https://github.com/SFML/SFML/blob/e45628e2ebc5843baa3739781276fa85a54d4653/test/CMakeLists.txt#L18-L22 -- set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF) -- set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF) -- get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) -- target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) -+ # set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF) -+ # set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF) -+ # get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) -+ # target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) - - target_link_libraries(unicode_test unicode Catch2::Catch2WithMain fmt::fmt-header-only) - add_test(unicode_test unicode_test) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15d61c44a95e..e81ba52744c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10302,11 +10302,20 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - libunicode = callPackage ../development/libraries/libunicode { - catch2 = catch2_3; - fmt = fmt_9; + libunicode = callPackage ../by-name/li/libunicode/package.nix { + stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; }; + libusbgx = callPackage ../development/libraries/libusbgx { }; + + libusbsio = callPackage ../development/libraries/libusbsio { }; + + libucontext = callPackage ../development/libraries/libucontext { }; + + libutempter = callPackage ../development/libraries/libutempter { }; + + libuldaq = callPackage ../development/libraries/libuldaq { }; + libunwind = # Use the system unwinder in the SDK but provide a compatibility package to: # 1. avoid evaluation errors with setting `unwind` to `null`; and From 37279cb3d66a5457280f975e3423abcdf0c88809 Mon Sep 17 00:00:00 2001 From: moni Date: Sun, 3 Nov 2024 08:04:28 +0800 Subject: [PATCH 010/192] glaze: init at 4.0.0 --- pkgs/by-name/gl/glaze/package.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/gl/glaze/package.nix diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix new file mode 100644 index 000000000000..733a92774535 --- /dev/null +++ b/pkgs/by-name/gl/glaze/package.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + avx2 ? false, +}: + +stdenv.mkDerivation (final: { + pname = "glaze"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "stephenberry"; + repo = "glaze"; + rev = "v${final.version}"; + hash = "sha256-zaGKYEnYTyAhtP0Hywxp8Y33wvjB1RkEoOGF41CaVnY"; + }; + + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ "-Dglaze_ENABLE_AVX2=${if avx2 then "ON" else "OFF"}" ]; + + meta = with lib; { + description = "Extremely fast, in memory, JSON and interface library for modern C++"; + platforms = platforms.all; + maintainers = with maintainers; [ moni ]; + license = licenses.mit; + }; +}) From ac196039ed84b22d9fd01267a9c11610e9d43b7f Mon Sep 17 00:00:00 2001 From: moni Date: Sun, 3 Nov 2024 08:25:18 +0800 Subject: [PATCH 011/192] termbench-pro: 2023-01-26 -> 2024-10-05 --- .../te/termbench-pro/dont-fetchcontent.diff | 41 +++++++++++++++++++ .../te/termbench-pro/package.nix} | 29 +++++++++---- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/te/termbench-pro/dont-fetchcontent.diff rename pkgs/{development/libraries/termbench-pro/default.nix => by-name/te/termbench-pro/package.nix} (53%) diff --git a/pkgs/by-name/te/termbench-pro/dont-fetchcontent.diff b/pkgs/by-name/te/termbench-pro/dont-fetchcontent.diff new file mode 100644 index 000000000000..80a1ccf7724e --- /dev/null +++ b/pkgs/by-name/te/termbench-pro/dont-fetchcontent.diff @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6948010..1ee264f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,14 +14,15 @@ if(NOT WIN32 AND NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release MinSizeRel RelWithDebInfo) + endif() + +-include(FetchContent) +-FetchContent_Declare( +- glaze +- GIT_REPOSITORY https://github.com/stephenberry/glaze.git +- GIT_TAG v3.4.2 +- GIT_SHALLOW TRUE +-) +-FetchContent_MakeAvailable(glaze) ++#include(FetchContent) ++#FetchContent_Declare( ++ #glaze ++ #GIT_REPOSITORY https://github.com/stephenberry/glaze.git ++ #GIT_TAG v3.4.2 ++ # GIT_SHALLOW TRUE ++ #) ++#FetchContent_MakeAvailable(glaze) ++#add() + + set(MASTER_PROJECT OFF) + if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) +diff --git a/libtermbench/CMakeLists.txt b/libtermbench/CMakeLists.txt +index f0ddc75..93f63ed 100644 +--- a/libtermbench/CMakeLists.txt ++++ b/libtermbench/CMakeLists.txt +@@ -25,6 +25,8 @@ set_target_properties(termbench PROPERTIES + + target_include_directories(termbench PUBLIC $ + $) ++ ++find_package(glaze REQUIRED) + target_link_libraries(termbench PUBLIC glaze::glaze) + + install(TARGETS termbench diff --git a/pkgs/development/libraries/termbench-pro/default.nix b/pkgs/by-name/te/termbench-pro/package.nix similarity index 53% rename from pkgs/development/libraries/termbench-pro/default.nix rename to pkgs/by-name/te/termbench-pro/package.nix index 5291536f695f..b5139a1af97e 100644 --- a/pkgs/development/libraries/termbench-pro/default.nix +++ b/pkgs/by-name/te/termbench-pro/package.nix @@ -1,33 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fmt, + glaze, +}: stdenv.mkDerivation { pname = "termbench-pro"; - version = "unstable-2023-01-26"; + version = "unstable-2024-10-05"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "termbench-pro"; - rev = "a4feadd3a698e4fe2d9dd5b03d5f941534a25a91"; - hash = "sha256-/zpJY9Mecalk7dneYZYzmFOroopFGklWw62a+LbiUVs="; + rev = "22a0c42f78dc2e522eb1089bf9976a9ff0ecdcad"; + hash = "sha256-Yyvlu/yx/yGc9Ci9Pn098YfTdywLZEaowQZeLM4WGjQ"; }; + # don't fetch glaze from CMakeLists.txt + patches = [ ./dont-fetchcontent.diff ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ fmt ]; + buildInputs = [ + fmt + glaze + ]; installPhase = '' runHook preInstall mkdir -p $out/bin mkdir -p $out/lib - mv termbenchpro/tbp $out/bin - mv libtermbench/libtermbench.a $out/lib + mv tb/tb $out/bin + mv libtermbench/libtermbench.* $out/lib runHook postInstall ''; meta = with lib; { description = "Terminal Benchmarking as CLI and library"; - mainProgram = "tbp"; + mainProgram = "tb"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ moni ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e81ba52744c8..7ce0162af77a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11216,7 +11216,9 @@ with pkgs; harfbuzz = harfbuzzFull; }; - termbench-pro = callPackage ../development/libraries/termbench-pro { fmt = fmt_8; }; + termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix { + stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; + }; texpresso = callPackage ../tools/typesetting/tex/texpresso { texpresso-tectonic = callPackage ../tools/typesetting/tex/texpresso/tectonic.nix { }; From b1fa370d51ae7090edb83a99da9effedcde436ed Mon Sep 17 00:00:00 2001 From: moni Date: Sun, 3 Nov 2024 08:51:42 +0800 Subject: [PATCH 012/192] contour: 0.4.3.6442 -> 0.5.1.7247 --- .../terminal-emulators/contour/default.nix | 106 ---------------- .../co}/contour/dont-fix-app-bundle.diff | 0 pkgs/by-name/co/contour/package.nix | 114 ++++++++++++++++++ pkgs/by-name/gl/glaze/package.nix | 4 +- pkgs/top-level/all-packages.nix | 19 +-- 5 files changed, 119 insertions(+), 124 deletions(-) delete mode 100644 pkgs/applications/terminal-emulators/contour/default.nix rename pkgs/{applications/terminal-emulators => by-name/co}/contour/dont-fix-app-bundle.diff (100%) create mode 100644 pkgs/by-name/co/contour/package.nix diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix deleted file mode 100644 index 78a1b7243cdc..000000000000 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, boxed-cpp -, freetype -, fontconfig -, libunicode -, libutempter -, termbench-pro -, qtmultimedia -, qt5compat -, wrapQtAppsHook -, pcre -, boost -, catch2 -, fmt -, microsoft-gsl -, range-v3 -, yaml-cpp -, ncurses -, file -, utmp -, sigtool -, nixosTests -, installShellFiles -}: - -stdenv.mkDerivation (final: { - pname = "contour"; - version = "0.4.3.6442"; - - src = fetchFromGitHub { - owner = "contour-terminal"; - repo = "contour"; - rev = "v${final.version}"; - hash = "sha256-m3BEhGbyQm07+1/h2IRhooLPDewmSuhRHOMpWPDluiY="; - }; - - patches = [ ./dont-fix-app-bundle.diff ]; - - outputs = [ "out" "terminfo" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ncurses - file - wrapQtAppsHook - installShellFiles - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; - - buildInputs = [ - boxed-cpp - fontconfig - freetype - libunicode - termbench-pro - qtmultimedia - qt5compat - pcre - boost - catch2 - fmt - microsoft-gsl - range-v3 - yaml-cpp - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ utmp ]; - - cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ]; - - postInstall = '' - mkdir -p $out/nix-support $terminfo/share - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir $out/Applications - installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh - installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish - cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share - mv $out/contour.app $out/Applications - ln -s $out/bin $out/Applications/contour.app/Contents/MacOS - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - mv $out/share/terminfo $terminfo/share/ - installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh - installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish - '' + '' - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - ''; - - passthru.tests.test = nixosTests.terminal-emulators.contour; - - meta = with lib; { - description = "Modern C++ Terminal Emulator"; - homepage = "https://github.com/contour-terminal/contour"; - changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; - license = licenses.asl20; - maintainers = with maintainers; [ moni ]; - platforms = platforms.unix; - mainProgram = "contour"; - # This was caused by boxed-cpp 1.4.2 -> 1.4.3 - # More details in issue #345752 - broken = true; - }; -}) diff --git a/pkgs/applications/terminal-emulators/contour/dont-fix-app-bundle.diff b/pkgs/by-name/co/contour/dont-fix-app-bundle.diff similarity index 100% rename from pkgs/applications/terminal-emulators/contour/dont-fix-app-bundle.diff rename to pkgs/by-name/co/contour/dont-fix-app-bundle.diff diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix new file mode 100644 index 000000000000..03f09fab4025 --- /dev/null +++ b/pkgs/by-name/co/contour/package.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + boxed-cpp, + freetype, + fontconfig, + libunicode, + libutempter, + termbench-pro, + qt6, + pcre, + boost, + catch2_3, + fmt, + microsoft-gsl, + range-v3, + yaml-cpp, + ncurses, + file, + apple-sdk_11, + libutil, + sigtool, + nixosTests, + installShellFiles, +}: + +stdenv.mkDerivation (final: { + pname = "contour"; + version = "0.5.1.7247"; + + src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "contour"; + rev = "v${final.version}"; + hash = "sha256-/vpbyaULemyM3elwaoofvbeeID7jNrmu8X8HlZxWGCk"; + }; + + patches = [ ./dont-fix-app-bundle.diff ]; + + outputs = [ + "out" + "terminfo" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ncurses + file + qt6.wrapQtAppsHook + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; + + buildInputs = + [ + boxed-cpp + fontconfig + freetype + libunicode + termbench-pro + qt6.qtmultimedia + qt6.qt5compat + pcre + boost + catch2_3 + fmt + microsoft-gsl + range-v3 + yaml-cpp + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + libutil + ]; + + cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ]; + + postInstall = + '' + mkdir -p $out/nix-support $terminfo/share + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh + installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish + cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share + mv $out/contour.app $out/Applications + ln -s $out/bin $out/Applications/contour.app/Contents/MacOS + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + mv $out/share/terminfo $terminfo/share/ + installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh + installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish + '' + + '' + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + + passthru.tests.test = nixosTests.terminal-emulators.contour; + + meta = with lib; { + description = "Modern C++ Terminal Emulator"; + homepage = "https://github.com/contour-terminal/contour"; + changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; + license = licenses.asl20; + maintainers = with maintainers; [ moni ]; + platforms = platforms.unix; + mainProgram = "contour"; + }; +}) diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 733a92774535..a36c79d89b39 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - avx2 ? false, + enableAvx2 ? false, }: stdenv.mkDerivation (final: { @@ -18,7 +18,7 @@ stdenv.mkDerivation (final: { }; nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-Dglaze_ENABLE_AVX2=${if avx2 then "ON" else "OFF"}" ]; + cmakeFlags = [ (lib.cmakeBool "glaze_ENABLE_AVX2" enableAvx2) ]; meta = with lib; { description = "Extremely fast, in memory, JSON and interface library for modern C++"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ce0162af77a..d2fbac935796 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1606,12 +1606,9 @@ with pkgs; ### APPLICATIONS/TERMINAL-EMULATORS - contour = qt6.callPackage ../applications/terminal-emulators/contour { - inherit (darwin.apple_sdk_11_0.libs) utmp; - inherit (darwin) sigtool; - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - catch2 = catch2_3; - fmt = fmt_9; + contour = callPackage ../by-name/co/contour/package.nix { + inherit (darwin) libutil sigtool; + stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; @@ -10306,16 +10303,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; }; - libusbgx = callPackage ../development/libraries/libusbgx { }; - - libusbsio = callPackage ../development/libraries/libusbsio { }; - - libucontext = callPackage ../development/libraries/libucontext { }; - - libutempter = callPackage ../development/libraries/libutempter { }; - - libuldaq = callPackage ../development/libraries/libuldaq { }; - libunwind = # Use the system unwinder in the SDK but provide a compatibility package to: # 1. avoid evaluation errors with setting `unwind` to `null`; and From 6d0d288cccb1be3aba5c7b05c971663a6306b70b Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 8 Nov 2024 20:51:18 +0800 Subject: [PATCH 013/192] clanlib: add passthru.updateScript --- pkgs/by-name/cl/clanlib/package.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix index 6369128d5a05..7ad09a7458ec 100644 --- a/pkgs/by-name/cl/clanlib/package.nix +++ b/pkgs/by-name/cl/clanlib/package.nix @@ -12,27 +12,20 @@ fontconfig, alsa-lib, libXrender, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clanlib"; version = "4.1.0"; src = fetchFromGitHub { repo = "ClanLib"; owner = "sphair"; - rev = "v${version}"; - sha256 = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE="; }; - patches = [ - (fetchpatch { - name = "clanlib-add-support-for-riscv.patch"; - url = "https://github.com/sphair/ClanLib/commit/f5f694205054b66dc800135c9b01673f69a7a671.patch"; - hash = "sha256-/1XLFaTZDQAlT2mG9P6SJzXtTg7IWYGQ18Sx0e9zh0s="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook @@ -48,6 +41,8 @@ stdenv.mkDerivation rec { libXrender ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/sphair/ClanLib"; description = "Cross platform toolkit library with a primary focus on game creation"; @@ -55,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nixinator ]; platforms = with lib.platforms; lib.intersectLists linux (x86 ++ arm ++ aarch64 ++ riscv); }; -} +}) From a4e49326e724949b9678eb467d623ee503260b78 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 8 Nov 2024 20:58:08 +0800 Subject: [PATCH 014/192] clanlib: 4.1.0 -> 4.2.0 --- pkgs/by-name/cl/clanlib/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix index 7ad09a7458ec..d3053408815a 100644 --- a/pkgs/by-name/cl/clanlib/package.nix +++ b/pkgs/by-name/cl/clanlib/package.nix @@ -12,18 +12,19 @@ fontconfig, alsa-lib, libXrender, + libXinerama, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "clanlib"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { repo = "ClanLib"; owner = "sphair"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE="; + hash = "sha256-sRHRkT8NiKVfa9YgP6DYV9WzCZoH7f0phHpoYMnCk98="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig alsa-lib libXrender + libXinerama ]; passthru.updateScript = nix-update-script { }; From 53a761ab825cee8348aecc2be095fbd3f9d02a61 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 9 Nov 2024 12:34:04 +0800 Subject: [PATCH 015/192] methane: nixfmt --- pkgs/by-name/me/methane/package.nix | 41 +++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix index b3c8fbf34a4b..9464343b9ca1 100644 --- a/pkgs/by-name/me/methane/package.nix +++ b/pkgs/by-name/me/methane/package.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, SDL2 -, SDL2_image -, SDL2_mixer -, fontconfig -, freealut -, libglut -, gettext -, libGL -, libGLU -, openal -, quesoglc -, clanlib -, libXrender -, libmikmod -, alsa-lib +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + SDL2, + SDL2_image, + SDL2_mixer, + fontconfig, + freealut, + libglut, + gettext, + libGL, + libGLU, + openal, + quesoglc, + clanlib, + libXrender, + libmikmod, + alsa-lib, }: stdenv.mkDerivation rec { @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { alsa-lib ]; - installPhase = '' + installPhase = '' runHook preInstall mkdir -p $out/bin/ $out/share/methane/ $out/share/docs/ cp methane $out/bin From 1bdfbcd3e849900cb2b266f0e052a5c7ff65c24b Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 9 Nov 2024 12:35:06 +0800 Subject: [PATCH 016/192] methane: add passthru.updateScript --- pkgs/by-name/me/methane/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix index 9464343b9ca1..3e41cad96afd 100644 --- a/pkgs/by-name/me/methane/package.nix +++ b/pkgs/by-name/me/methane/package.nix @@ -18,23 +18,25 @@ libXrender, libmikmod, alsa-lib, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "methane"; version = "2.0.1"; src = fetchFromGitHub { repo = "methane"; owner = "rombust"; - rev = "v${version}"; - sha256 = "sha256-STS2+wfZ8E1jpr0PYQOBQsztxhJU0Dt3IhWBE3sjdWE="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-STS2+wfZ8E1jpr0PYQOBQsztxhJU0Dt3IhWBE3sjdWE="; }; nativeBuildInputs = [ gettext pkg-config ]; + buildInputs = [ SDL2 SDL2_image @@ -61,12 +63,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/rombust/methane"; description = "Clone of Taito's Bubble Bobble arcade game released for Amiga in 1993 by Apache Software"; mainProgram = "methane"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ nixinator ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ nixinator ]; platforms = [ "x86_64-linux" ]; }; -} +}) From c327b0c60d9b807e816c12e9f894244ed03558a3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 9 Nov 2024 12:36:38 +0800 Subject: [PATCH 017/192] methane: 2.0.1 -> 2.1.0 --- pkgs/by-name/me/methane/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix index 3e41cad96afd..e1590859837f 100644 --- a/pkgs/by-name/me/methane/package.nix +++ b/pkgs/by-name/me/methane/package.nix @@ -19,17 +19,18 @@ libmikmod, alsa-lib, nix-update-script, + libXinerama, }: stdenv.mkDerivation (finalAttrs:{ pname = "methane"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { repo = "methane"; owner = "rombust"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-STS2+wfZ8E1jpr0PYQOBQsztxhJU0Dt3IhWBE3sjdWE="; + hash = "sha256-rByJqkhYsRuv0gTug+vP2qgkRY8TnX+Qx4/MbAmPTOU="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs:{ quesoglc clanlib libXrender + libXinerama libmikmod alsa-lib ]; From f70f1c7be0c7bc097ac0aac0f36e63fae32be609 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 13 Nov 2024 20:54:56 +0800 Subject: [PATCH 018/192] python3Packages.brian2: fix build --- .../brian2/0001-remove-invalidxyz.patch | 27 +++++++++++++++ .../python-modules/brian2/default.nix | 34 ++++++++++++++++--- 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/brian2/0001-remove-invalidxyz.patch diff --git a/pkgs/development/python-modules/brian2/0001-remove-invalidxyz.patch b/pkgs/development/python-modules/brian2/0001-remove-invalidxyz.patch new file mode 100644 index 000000000000..435e3d12cacc --- /dev/null +++ b/pkgs/development/python-modules/brian2/0001-remove-invalidxyz.patch @@ -0,0 +1,27 @@ +From dbf0af29767629def355427cf63410158708c632 Mon Sep 17 00:00:00 2001 +From: Bot_wxt1221 <3264117476@qq.com> +Date: Wed, 13 Nov 2024 21:15:04 +0800 +Subject: [PATCH] Update test_codegen.py + +--- + brian2/tests/test_codegen.py | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/brian2/tests/test_codegen.py b/brian2/tests/test_codegen.py +index fdc03cdf2..6f7ae50bd 100644 +--- a/brian2/tests/test_codegen.py ++++ b/brian2/tests/test_codegen.py +@@ -589,13 +589,6 @@ def test_cpp_flags_support(): + _, compile_args = get_compiler_and_args() + assert compile_args == prefs["codegen.cpp.extra_compile_args"] + +- # Should never be supported and raise a warning +- prefs["codegen.cpp.extra_compile_args"] = ["-invalidxyz"] +- with catch_logs() as l: +- _, compile_args = get_compiler_and_args() +- assert len(l) == 1 and l[0][0] == "WARNING" +- assert compile_args == [] +- + prefs["codegen.cpp.extra_compile_args"] = old_prefs + + diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index a0021585cfc5..d9f23ec574b1 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -9,8 +9,12 @@ setuptools, sympy, pytest, + pythonOlder, pytest-xdist, + setuptools-scm, python, + scipy, + fetchpatch, }: buildPythonPackage rec { @@ -18,12 +22,33 @@ buildPythonPackage rec { version = "2.7.1"; pyproject = true; + # https://github.com/python/cpython/issues/117692 + disabled = pythonOlder "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-mp1xo6ooYm21s6FYcegQdsHmVgH81usV9IfIM0GM7lc="; }; - build-system = [ setuptools ]; + patches = [ + (fetchpatch { + url = "https://github.com/brian-team/brian2/commit/8ed663cafde42cbe2e0171cb19d2217e01676d20.patch"; + hash = "sha256-+s5SJdJmsnee3sWhaj/jwf8RXkfMrLp0aTWF52jLdqU="; + }) + ./0001-remove-invalidxyz.patch # invalidxyz are reported as error so I remove it + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0rc1" "numpy" + + substituteInPlace brian2/codegen/cpp_prefs.py \ + --replace-fail "distutils" "setuptools._distutils" + ''; + + build-system = [ + setuptools-scm + ]; dependencies = [ cython @@ -32,6 +57,7 @@ buildPythonPackage rec { pyparsing setuptools sympy + scipy ]; nativeCheckInputs = [ @@ -47,10 +73,10 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Clock-driven simulator for spiking neural networks"; homepage = "https://briansimulator.org/"; - license = licenses.cecill21; - maintainers = with maintainers; [ jiegec ]; + license = lib.licenses.cecill21; + maintainers = with lib.maintainers; [ jiegec ]; }; } From 4d5b900cce97a109df9db2ab2e6f228f5e202269 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 9 Nov 2024 08:18:30 -0600 Subject: [PATCH 019/192] gdal: format --- pkgs/development/libraries/gdal/default.nix | 332 +++++++++++--------- 1 file changed, 182 insertions(+), 150 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 7743f1e9e98d..06f83c6c5e87 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,81 +1,83 @@ -{ lib -, stdenv -, callPackage -, fetchFromGitHub -, fetchpatch +{ + lib, + stdenv, + callPackage, + fetchFromGitHub, + fetchpatch, -, useMinimalFeatures ? false -, useTiledb ? (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) -, useLibHEIF ? (!useMinimalFeatures) -, useLibJXL ? (!useMinimalFeatures) -, useMysql ? (!useMinimalFeatures) -, usePostgres ? (!useMinimalFeatures) -, usePoppler ? (!useMinimalFeatures) -, useArrow ? (!useMinimalFeatures) -, useHDF ? (!useMinimalFeatures) -, useNetCDF ? (!useMinimalFeatures) -, useArmadillo ? (!useMinimalFeatures) -, useJava ? (!useMinimalFeatures) + useMinimalFeatures ? false, + useArmadillo ? (!useMinimalFeatures), + useArrow ? (!useMinimalFeatures), + useHDF ? (!useMinimalFeatures), + useJava ? (!useMinimalFeatures), + useLibHEIF ? (!useMinimalFeatures), + useLibJXL ? (!useMinimalFeatures), + useMysql ? (!useMinimalFeatures), + useNetCDF ? (!useMinimalFeatures), + usePoppler ? (!useMinimalFeatures), + usePostgres ? (!useMinimalFeatures), + useTiledb ? + (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64), -, ant -, bison -, cmake -, gtest -, doxygen -, graphviz -, pkg-config -, python3 -, swig -, armadillo -, arrow-cpp -, c-blosc -, brunsli -, cfitsio -, crunch -, curl -, cryptopp -, libdeflate -, expat -, libgeotiff -, geos -, giflib -, jdk -, libheif -, dav1d -, libaom -, libde265 -, rav1e -, x265 -, hdf4 -, hdf5-cpp -, libiconv -, libjpeg -, json_c -, libjxl -, libhwy -, lerc -, xz -, libxml2 -, lz4 -, libmysqlclient -, netcdf -, openexr -, openjpeg -, openssl -, pcre2 -, libpng -, poppler -, postgresql -, proj -, qhull -, libspatialite -, sqlite -, libtiff -, tiledb -, libwebp -, xercesc -, zlib -, zstd + ant, + armadillo, + arrow-cpp, + bison, + brunsli, + c-blosc, + cfitsio, + cmake, + crunch, + cryptopp, + curl, + dav1d, + doxygen, + expat, + geos, + giflib, + graphviz, + gtest, + hdf4, + hdf5-cpp, + jdk, + json_c, + lerc, + libaom, + libde265, + libdeflate, + libgeotiff, + libheif, + libhwy, + libiconv, + libjpeg, + libjxl, + libmysqlclient, + libpng, + libspatialite, + libtiff, + libwebp, + libxml2, + lz4, + netcdf, + openexr, + openjpeg, + openssl, + pcre2, + pkg-config, + poppler, + postgresql, + proj, + python3, + qhull, + rav1e, + sqlite, + swig, + tiledb, + x265, + xercesc, + xz, + zlib, + zstd, }: stdenv.mkDerivation (finalAttrs: { @@ -101,36 +103,49 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - bison - cmake - doxygen - graphviz - pkg-config - python3.pkgs.setuptools - python3.pkgs.wrapPython - swig - ] ++ lib.optionals useJava [ ant jdk ]; + nativeBuildInputs = + [ + bison + cmake + doxygen + graphviz + pkg-config + python3.pkgs.setuptools + python3.pkgs.wrapPython + swig + ] + ++ lib.optionals useJava [ + ant + jdk + ]; - cmakeFlags = [ - "-DGDAL_USE_INTERNAL_LIBS=OFF" - "-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include" - "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" - "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ lib.optionals finalAttrs.doInstallCheck [ - "-DBUILD_TESTING=ON" - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" - ] ++ lib.optionals (!useTiledb) [ - "-DGDAL_USE_TILEDB=OFF" - ] ++ lib.optionals (!useJava) [ - # This is not strictly needed as the Java bindings wouldn't build anyway if - # ant/jdk were not available. - "-DBUILD_JAVA_BINDINGS=OFF" - ]; + cmakeFlags = + [ + "-DGDAL_USE_INTERNAL_LIBS=OFF" + "-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include" + "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" + "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${ + lib.optionalString (libmysqlclient.pname != "mysql") "mysql/" + }libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" + ] + ++ lib.optionals finalAttrs.doInstallCheck [ + "-DBUILD_TESTING=ON" + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + ] + ++ lib.optionals (!useTiledb) [ + "-DGDAL_USE_TILEDB=OFF" + ] + ++ lib.optionals (!useJava) [ + # This is not strictly needed as the Java bindings wouldn't build anyway if + # ant/jdk were not available. + "-DBUILD_JAVA_BINDINGS=OFF" + ]; buildInputs = let @@ -159,11 +174,14 @@ stdenv.mkDerivation (finalAttrs: { armadilloDeps = lib.optionals useArmadillo [ armadillo ]; darwinDeps = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) ([ - # tests for formats enabled by these packages fail on macos - openexr - xercesc - ] ++ arrowDeps); + nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) ( + [ + # tests for formats enabled by these packages fail on macos + openexr + xercesc + ] + ++ arrowDeps + ); in [ c-blosc @@ -198,7 +216,8 @@ stdenv.mkDerivation (finalAttrs: { zstd python3 python3.pkgs.numpy - ] ++ tileDbDeps + ] + ++ tileDbDeps ++ libHeifDeps ++ libJxlDeps ++ mysqlDeps @@ -212,13 +231,15 @@ stdenv.mkDerivation (finalAttrs: { ++ nonDarwinDeps; pythonPath = [ python3.pkgs.numpy ]; - postInstall = '' - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" - '' + lib.optionalString useJava '' - cd $out/lib - ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary} - cd - - ''; + postInstall = + '' + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + '' + + lib.optionalString useJava '' + cd $out/lib + ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary} + cd - + ''; enableParallelBuilding = true; @@ -252,37 +273,42 @@ stdenv.mkDerivation (finalAttrs: { "gdrivers/gdalhttp.py" "gdrivers/wms.py" ]; - disabledTests = [ - # tests that attempt to make network requests - "test_jp2openjpeg_45" - # tests that require the full proj dataset which we don't package yet - # https://github.com/OSGeo/gdal/issues/5523 - "test_transformer_dem_overrride_srs" - "test_osr_ct_options_area_of_interest" - # ZIP does not support timestamps before 1980 - "test_sentinel2_zipped" - # tries to call unwrapped executable - "test_SetPROJAuxDbPaths" - # fixed and renamed in 3.8.0RC1 - # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 - "test_visoss_6" - # failing with PROJ 9.3.1 - # https://github.com/OSGeo/gdal/issues/8908 - "test_osr_esri_28" - # failing for unknown reason - # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085 - "test_ogr_gmlas_billion_laugh" - ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ - # likely precision-related expecting x87 behaviour - "test_jp2openjpeg_22" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # flaky on macos - "test_rda_download_queue" - ] ++ lib.optionals (lib.versionOlder proj.version "8") [ - "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" - ] ++ lib.optionals (!usePoppler) [ - "test_pdf_jpx_compression" - ]; + disabledTests = + [ + # tests that attempt to make network requests + "test_jp2openjpeg_45" + # tests that require the full proj dataset which we don't package yet + # https://github.com/OSGeo/gdal/issues/5523 + "test_transformer_dem_overrride_srs" + "test_osr_ct_options_area_of_interest" + # ZIP does not support timestamps before 1980 + "test_sentinel2_zipped" + # tries to call unwrapped executable + "test_SetPROJAuxDbPaths" + # fixed and renamed in 3.8.0RC1 + # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 + "test_visoss_6" + # failing with PROJ 9.3.1 + # https://github.com/OSGeo/gdal/issues/8908 + "test_osr_esri_28" + # failing for unknown reason + # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085 + "test_ogr_gmlas_billion_laugh" + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ + # likely precision-related expecting x87 behaviour + "test_jp2openjpeg_22" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # flaky on macos + "test_rda_download_queue" + ] + ++ lib.optionals (lib.versionOlder proj.version "8") [ + "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" + ] + ++ lib.optionals (!usePoppler) [ + "test_pdf_jpx_compression" + ]; postCheck = '' popd # autotest ''; @@ -296,7 +322,13 @@ stdenv.mkDerivation (finalAttrs: { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; license = licenses.mit; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber dotlambda ]; + maintainers = + with maintainers; + teams.geospatial.members + ++ [ + marcweber + dotlambda + ]; platforms = platforms.unix; }; }) From 7e41021c7b37d54dd3cad5de45aa2a20dc8398ef Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 9 Nov 2024 08:32:18 -0600 Subject: [PATCH 020/192] gdal: disable failing darwin test --- pkgs/development/libraries/gdal/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 06f83c6c5e87..2085d2f2e14e 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -302,6 +302,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on macos "test_rda_download_queue" + "test_ogr_gpkg_arrow_stream_huge_array" ] ++ lib.optionals (lib.versionOlder proj.version "8") [ "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" From 15b9239b091307d0d319d46f7adf75e9153f179f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 9 Nov 2024 09:54:22 -0600 Subject: [PATCH 021/192] gdal: remove unnecessary disabled tests Were fixed in previous versions. --- pkgs/development/libraries/gdal/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 2085d2f2e14e..a339951b7294 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -285,12 +285,6 @@ stdenv.mkDerivation (finalAttrs: { "test_sentinel2_zipped" # tries to call unwrapped executable "test_SetPROJAuxDbPaths" - # fixed and renamed in 3.8.0RC1 - # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 - "test_visoss_6" - # failing with PROJ 9.3.1 - # https://github.com/OSGeo/gdal/issues/8908 - "test_osr_esri_28" # failing for unknown reason # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085 "test_ogr_gmlas_billion_laugh" From a413763d8856a7a49ee777ac076b28c8502fba69 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 10 Nov 2024 10:14:35 -0600 Subject: [PATCH 022/192] gdal: disable flaky tests Disabling a few tests that have been reported by various users and upstream to be inconsistent to avoid transient failures and triggering rebuilds. --- pkgs/development/libraries/gdal/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index a339951b7294..b33641a3442a 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -288,6 +288,11 @@ stdenv.mkDerivation (finalAttrs: { # failing for unknown reason # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085 "test_ogr_gmlas_billion_laugh" + # Flaky on hydra, collected in https://github.com/NixOS/nixpkgs/pull/327323. + "test_ogr_gmlas_huge_processing_time" + "test_ogr_gpkg_background_rtree_build" + "test_vsiaz_fake_write" + "test_vsioss_6" ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ # likely precision-related expecting x87 behaviour From 980289d071d76425fc2f908b01b458b988650a93 Mon Sep 17 00:00:00 2001 From: Katherine Jamison Date: Fri, 15 Nov 2024 13:41:34 -0700 Subject: [PATCH 023/192] maintainers: add axertheaxe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5e2792825044..3cac9ac4f896 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2273,6 +2273,12 @@ githubId = 206242; name = "Andreas Wiese"; }; + axertheaxe = { + email = "axertheaxe@proton.me"; + github = "axertheaxe"; + githubId = 99703210; + name = "Katherine Jamison"; + }; ayazhafiz = { email = "ayaz.hafiz.1@gmail.com"; github = "hafiz"; From 889eae69e49e6d053a5a3d61fcaa7ff0fbe5dab0 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 16 Nov 2024 13:37:23 +0900 Subject: [PATCH 024/192] gurk-rs: add passthru.tests.version --- .../networking/instant-messengers/gurk-rs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index ae7001fe7bf9..d9b2a7d16340 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -7,6 +7,8 @@ , pkgsBuildHost , openssl , pkg-config +, testers +, gurk-rs }: rustPlatform.buildRustPackage rec { @@ -48,6 +50,10 @@ rustPlatform.buildRustPackage rec { useNextest = true; + passthru.tests.version = testers.testVersion { + package = gurk-rs; + }; + meta = with lib; { description = "Signal Messenger client for terminal"; mainProgram = "gurk"; From eef4b68dd0406f1c2978ae565522ec9299e6c2ce Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 15 Nov 2024 18:30:44 +0800 Subject: [PATCH 025/192] python3Packages.python-measurement: 3.2.2 -> 4.0a8 --- .../development/python-modules/measurement/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index d69e8d4532dc..67a7d1b10761 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "measurement"; - version = "3.2.2"; + version = "4.0a8"; format = "pyproject"; disabled = !isPy3k; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "coddingtonbear"; repo = "python-measurement"; rev = "refs/tags/${version}"; - hash = "sha256-ULId0W10FaAtSgVY5ctQL3FPETVr+oq6TKWd/W53viM="; + hash = "sha256-QxXxx9Jbx7ykQFaw/3S6ANPUmw3mhvSa4np6crsfVtE="; }; nativeBuildInputs = [ @@ -39,11 +39,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Use and manipulate unit-aware measurement objects in Python"; homepage = "https://github.com/coddingtonbear/python-measurement"; changelog = "https://github.com/coddingtonbear/python-measurement/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bhipple ]; }; } From b01b12dcce52b29e67046f8b9d52266be03de0ac Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 16 Nov 2024 17:01:53 +0800 Subject: [PATCH 026/192] python311Packages.myfitnesspal: fix build --- .../python-modules/myfitnesspal/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 47eb87233ce1..5572ff0d69b0 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -55,6 +55,11 @@ buildPythonPackage rec { postPatch = '' # Remove overly restrictive version constraints sed -i -e "s/>=.*//" requirements.txt + + # https://github.com/coddingtonbear/python-measurement/pull/8 + substituteInPlace tests/test_client.py \ + --replace-fail "Weight" "Mass" \ + --replace-fail '"Mass"' '"Weight"' ''; disabledTests = [ @@ -64,11 +69,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "myfitnesspal" ]; - meta = with lib; { + meta = { description = "Python module to access meal tracking data stored in MyFitnessPal"; mainProgram = "myfitnesspal"; homepage = "https://github.com/coddingtonbear/python-myfitnesspal"; - license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bhipple ]; }; } From 6be7fb37a63d254ba27e29c2732a6ada374723c0 Mon Sep 17 00:00:00 2001 From: MadMaurice Date: Fri, 15 Nov 2024 16:33:37 +0100 Subject: [PATCH 027/192] python3Packages.django-ninja: 1.3.0 -> 1.3.0-unstable-2024-11-13 fixes build --- pkgs/development/python-modules/django-ninja/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index 4a953cfed3fd..8fbecf4559ac 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.3.0"; + version = "1.3.0-unstable-2024-11-13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vitalik"; repo = "django-ninja"; - rev = "refs/tags/v${version}"; - hash = "sha256-fPlw9iTt1V8VXd0d5hw1i9LT96BcDkAlpBu9SPPd+hI="; + rev = "ee0f27b169fb227e8786bbf9011659f46b2795ea"; + hash = "sha256-8qjGEo2n0O4WrKqhaBZNSDAW4fTOBg/nX7T4eOoJ+Pw="; }; propagatedBuildInputs = [ From 3b48d0996c2f3d3dbd8126e9a29903871e2c2afe Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Sun, 17 Nov 2024 02:03:42 +0100 Subject: [PATCH 028/192] python3Packages.inject: init at 5.2.1 --- .../python-modules/inject/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/inject/default.nix diff --git a/pkgs/development/python-modules/inject/default.nix b/pkgs/development/python-modules/inject/default.nix new file mode 100644 index 000000000000..20c1a2d3395c --- /dev/null +++ b/pkgs/development/python-modules/inject/default.nix @@ -0,0 +1,43 @@ +{ + buildPythonPackage, + fetchFromGitHub, + hatch-vcs, + hatchling, + lib, + nix-update-script, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "inject"; + version = "5.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ivankorobkov"; + repo = "python-inject"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ws296ESjb+a322imiRRWTS43w32rJc/7Y//OBQXOwnw="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "inject" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Python dependency injection framework"; + homepage = "https://github.com/ivankorobkov/python-inject"; + changelog = "https://github.com/ivankorobkov/python-inject/blob/${version}/CHANGES.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ perchun ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80cf4c5e1fee..fdfe2a7861be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6224,6 +6224,8 @@ self: super: with self; { iniparse = callPackage ../development/python-modules/iniparse { }; + inject = callPackage ../development/python-modules/inject { }; + injector = callPackage ../development/python-modules/injector { }; inkbird-ble = callPackage ../development/python-modules/inkbird-ble { }; From 822966abb9caa1e4ae674d549240bd9a573f8818 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 19 Nov 2024 01:04:39 +0900 Subject: [PATCH 029/192] rubyPackages.ncursesw: 1.4.10 -> 1.4.11 To fix build on darwin --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 6c33cde39021..dcaa14483eaf 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2373,10 +2373,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr"; + sha256 = "0qlfhp9b445g0qp9kkdiylfjlpfzrv6nqvry4ar6y0yacn0zr5y8"; type = "gem"; }; - version = "1.4.10"; + version = "1.4.11"; }; net-http = { dependencies = ["uri"]; From f0119d67e47a75b4579ae707cebeec66f34de80b Mon Sep 17 00:00:00 2001 From: Tyler Langlois Date: Tue, 5 Nov 2024 10:31:28 -0700 Subject: [PATCH 030/192] kernelPackages.ivsc-driver: mark as broken on kernels >= 6.9 --- pkgs/os-specific/linux/ivsc-driver/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ivsc-driver/default.nix b/pkgs/os-specific/linux/ivsc-driver/default.nix index d9fa513ede87..65733d99a659 100644 --- a/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Only; maintainers = [ ]; platforms = [ "x86_64-linux" ]; - broken = kernel.kernelOlder "5.15"; + # This module is in mainline now and upstream suggests using that + # with recent kernels rather than the out-of-tree module. + broken = kernel.kernelOlder "5.15" || kernel.kernelAtLeast "6.9"; }; } From b3676d1ee144d34a58821d7584a5403eee9b780f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Nov 2024 20:13:40 +0100 Subject: [PATCH 031/192] nixVersions.nix_2_25: add missing python build dep for mdbook Needed for https://github.com/NixOS/nix/blob/master/doc/manual/substitute.py --- pkgs/tools/package-management/nix/common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 62b8e2dbcf3a..c5bd16eb93c9 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -21,6 +21,7 @@ let atLeast220 = lib.versionAtLeast version "2.20pre"; atLeast221 = lib.versionAtLeast version "2.21pre"; atLeast224 = lib.versionAtLeast version "2.24pre"; + atLeast225 = lib.versionAtLeast version "2.25pre"; # Major.minor versions unaffected by CVE-2024-27297 unaffectedByFodSandboxEscape = [ "2.3" @@ -72,6 +73,7 @@ in , nixVersions , openssl , perl +, python3 , pkg-config , rapidcheck , Security @@ -151,6 +153,8 @@ self = stdenv.mkDerivation { libgit2 ] ++ lib.optionals (atLeast224 || lib.versionAtLeast version "pre20240626") [ toml11 + ] ++ lib.optionals (atLeast225 && enableDocumentation) [ + python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ From b3d4323124a1dcbc1e7c611940e5e6d990000449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Nov 2024 20:14:16 +0100 Subject: [PATCH 032/192] nix: remove unused paranthese/nixVersions variable --- pkgs/tools/package-management/nix/common.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index c5bd16eb93c9..a4d233b2b128 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -70,7 +70,6 @@ in , mdbook-linkcheck , nlohmann_json , nixosTests -, nixVersions , openssl , perl , python3 @@ -178,10 +177,9 @@ self = stdenv.mkDerivation { (darwinMinVersionHook "10.13") ]; - propagatedBuildInputs = [ boehmgc - ] ++ lib.optionals (atLeast27) [ + ] ++ lib.optionals atLeast27 [ nlohmann_json ]; From 23cd038879f9b5effb9ae9298037039808f55673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Nov 2024 20:15:08 +0100 Subject: [PATCH 033/192] nixVersions.latest: set to nix 2.25 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ad9892ab0ebf..3a3169d3497f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -233,7 +233,7 @@ in lib.makeExtensible (self: ({ self_attribute_name = "git"; }; - latest = self.nix_2_24; + latest = self.nix_2_25; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, From c35f615aea0cbfcbed0cc7c0fde1fc46f7d3edd3 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Fri, 19 Apr 2024 15:10:26 +0200 Subject: [PATCH 034/192] dragmap: init at 1.3.0 Genomic mapper. Open-source version of DRAGEN. Tests are run during execution with google-tests. --- pkgs/by-name/dr/dragmap/cstdint.patch | 60 +++++++++++++++++++ pkgs/by-name/dr/dragmap/package.nix | 68 ++++++++++++++++++++++ pkgs/by-name/dr/dragmap/stdio-pclose.patch | 12 ++++ 3 files changed, 140 insertions(+) create mode 100644 pkgs/by-name/dr/dragmap/cstdint.patch create mode 100644 pkgs/by-name/dr/dragmap/package.nix create mode 100644 pkgs/by-name/dr/dragmap/stdio-pclose.patch diff --git a/pkgs/by-name/dr/dragmap/cstdint.patch b/pkgs/by-name/dr/dragmap/cstdint.patch new file mode 100644 index 000000000000..b9b0721173d7 --- /dev/null +++ b/pkgs/by-name/dr/dragmap/cstdint.patch @@ -0,0 +1,60 @@ +diff --git a/src/include/map/SeedPosition.hpp b/src/include/map/SeedPosition.hpp +index 30a7d47..c05af16 100644 +--- a/src/include/map/SeedPosition.hpp ++++ b/src/include/map/SeedPosition.hpp +@@ -16,6 +16,7 @@ + #define MAP_SEED_POSITION_HPP + + #include ++#include + + #include "sequences/Seed.hpp" + +diff --git a/src/include/sequences/Read.hpp b/src/include/sequences/Read.hpp +index 460c1cb..c7ff619 100644 +--- a/src/include/sequences/Read.hpp ++++ b/src/include/sequences/Read.hpp +@@ -16,6 +16,7 @@ + #define SEQUENCES_READ_HPP + + #include ++#include + #include + #include + +diff --git a/src/include/sequences/Seed.hpp b/src/include/sequences/Seed.hpp +index a242153..dd4d23b 100644 +--- a/src/include/sequences/Seed.hpp ++++ b/src/include/sequences/Seed.hpp +@@ -16,6 +16,7 @@ + #define SEQUENCES_SEED_HPP + + #include ++#include + #include + + #include "sequences/Read.hpp" +diff --git a/src/lib/sequences/tests/unit/CrcHasherMocks.hpp b/src/lib/sequences/tests/unit/CrcHasherMocks.hpp +index 1866be7..5d9b7d7 100644 +--- a/src/lib/sequences/tests/unit/CrcHasherMocks.hpp ++++ b/src/lib/sequences/tests/unit/CrcHasherMocks.hpp +@@ -2,6 +2,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/stubs/dragen/src/host/dragen_api/read_group_list.hpp b/stubs/dragen/src/host/dragen_api/read_group_list.hpp +index eefb9ae..623a77f 100644 +--- a/stubs/dragen/src/host/dragen_api/read_group_list.hpp ++++ b/stubs/dragen/src/host/dragen_api/read_group_list.hpp +@@ -14,6 +14,7 @@ + #define __READ_GROUP_LIST_HPP__ + + #include "dragen_exception.hpp" ++#include + class ReadGroupList { + public: + const std::string &getReadGroupName(const uint16_t idx) const { diff --git a/pkgs/by-name/dr/dragmap/package.nix b/pkgs/by-name/dr/dragmap/package.nix new file mode 100644 index 000000000000..9f61cbb3e5e4 --- /dev/null +++ b/pkgs/by-name/dr/dragmap/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + boost, + gtest, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dragmap"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "Illumina"; + repo = "DRAGMAP"; + rev = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-f1jsOErriS1I/iUS4CzJ3+Dz8SMUve/ccb3KaE+L7U8="; + }; + + nativebuildInputs = [ boost ]; + buildInputs = [ + gtest + zlib + ]; + + patches = [ + # pclose is called on a NULL value. This is no longer allowed since + # https://github.com/bminor/glibc/commit/64b1a44183a3094672ed304532bedb9acc707554 + ./stdio-pclose.patch + + # Add missing include cstdint. Upstream does not accept PR. Issue opened at + # https://github.com/Illumina/DRAGMAP/issues/63 + ./cstdint.patch + ]; + + env = { + GTEST_INCLUDEDIR = "${gtest.dev}/include"; + CPPFLAGS = "-I ${boost.dev}/include"; + LDFLAGS = "-L ${boost.out}/lib"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp build/release/dragen-os $out/bin/ + + runHook postInstall + ''; + + # Tests are launched by default from makefile + doCheck = false; + + meta = with lib; { + description = "Open Source version of Dragen mapper for genomics"; + mainProgram = "dragen-os"; + longDescription = '' + DRAGMAP is an open-source software implementation of the DRAGEN mapper, + which the Illumina team created to procude the same results as their + proprietary DRAGEN hardware. + ''; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ apraga ]; + }; +}) diff --git a/pkgs/by-name/dr/dragmap/stdio-pclose.patch b/pkgs/by-name/dr/dragmap/stdio-pclose.patch new file mode 100644 index 000000000000..74e8d57e9fa5 --- /dev/null +++ b/pkgs/by-name/dr/dragmap/stdio-pclose.patch @@ -0,0 +1,12 @@ +diff --git a/stubs/dragen/src/host/infra/linux/infra_linux_utils.cpp b/stubs/dragen/src/host/infra/linux/infra_linux_utils.cpp +index cd02cd4..c26e9cf 100644 +--- a/stubs/dragen/src/host/infra/linux/infra_linux_utils.cpp ++++ b/stubs/dragen/src/host/infra/linux/infra_linux_utils.cpp +@@ -57,7 +57,6 @@ int GetDmiValue(const std::string& label, std::string& value) + FILE* dmiOutput = popen("sudo /usr/sbin/dmidecode -t 2", "r"); + if (dmiOutput == NULL) { + perror("dmidecode popen"); +- pclose(dmiOutput); + return -1; + } + From 704efbd9aa3494cf4f762737274c13e9e90ca393 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 19 Nov 2024 09:47:16 +0100 Subject: [PATCH 035/192] opencomposite: add meta.platforms OpenComposite can't work on macOS as openxr-loader doesn't work on darwin. Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/op/opencomposite/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 30a18084aa32..dec0433ff336 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -11,6 +11,7 @@ vulkan-headers, vulkan-loader, xorg, + openxr-loader, }: stdenv.mkDerivation { @@ -61,5 +62,7 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/znixian/OpenOVR"; license = with lib.licenses; [ gpl3Only ]; maintainers = with lib.maintainers; [ Scrumplex ]; + # This can realistically only work on systems that support OpenXR Loader + inherit (openxr-loader.meta) platforms; }; } From 32cb2b2abe5a4ed0419f0aa8e5f6ef55c5e7d2fe Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Tue, 19 Nov 2024 06:12:55 -0600 Subject: [PATCH 036/192] check_interfaces: fix overuse of with lib --- .../nagios-plugins/check_interfaces/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix index 510e69702c5f..9fb4ab26ed31 100644 --- a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { changelog = "https://github.com/NETWAYS/check_interfaces/releases/tag/v${version}"; description = "Icinga check plugin for network hardware interfaces"; homepage = "https://github.com/NETWAYS/check_interfaces/"; - license = with licenses; [ gpl2Only ]; - platforms = platforms.unix; - maintainers = with maintainers; [ jwillikers ]; + license = with lib.licenses; [ gpl2Only ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "check_interfaces"; }; } From af51a7fb84ced3d514b359da91c37e5a1a05186b Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Tue, 19 Nov 2024 06:14:14 -0600 Subject: [PATCH 037/192] manubulon-snmp-plugins: fix overuse of with lib --- .../nagios-plugins/manubulon-snmp-plugins/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix index edb8f7dca0fa..3cc270557a01 100644 --- a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix @@ -56,12 +56,12 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { changelog = "https://github.com/SteScho/manubulon-snmp/releases/tag/v${version}"; description = "Set of Icinga/Nagios plugins to check hosts and hardware with the SNMP protocol"; homepage = "https://github.com/SteScho/manubulon-snmp"; - license = with licenses; [ gpl2Only ]; - platforms = platforms.unix; - maintainers = with maintainers; [ jwillikers ]; + license = with lib.licenses; [ gpl2Only ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jwillikers ]; }; } From 30392773af69d096895a63b4988b5c8edb284333 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Tue, 19 Nov 2024 06:15:12 -0600 Subject: [PATCH 038/192] openbsd_snmp3_check: fix overuse of with lib --- .../nagios-plugins/openbsd_snmp3_check/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix index 62b435a890c9..36ca174a8e66 100644 --- a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix @@ -29,13 +29,13 @@ python3Packages.buildPythonApplication rec { }; }; - meta = with lib; { + meta = { changelog = "https://github.com/alexander-naumov/openbsd_snmp3_check/releases/tag/v${version}"; description = "SNMP v3 check for OpenBSD systems state monitoring"; homepage = "https://github.com/alexander-naumov/openbsd_snmp3_check"; - license = with licenses; [ bsd3 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ jwillikers ]; + license = with lib.licenses; [ bsd3 ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "openbsd_snmp3.py"; }; } From 34845dd5f012d2de05b7e94a904c74542e489725 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 19 Nov 2024 23:47:52 +0800 Subject: [PATCH 039/192] go9p: init at 0.25.0 --- pkgs/by-name/go/go9p/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/go/go9p/package.nix diff --git a/pkgs/by-name/go/go9p/package.nix b/pkgs/by-name/go/go9p/package.nix new file mode 100644 index 000000000000..9cb84797c96a --- /dev/null +++ b/pkgs/by-name/go/go9p/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "go9p"; + version = "0.25.0"; + + src = fetchFromGitHub { + owner = "knusbaum"; + repo = "go9p"; + rev = "refs/tags/v${version}"; + hash = "sha256-dqaj92LwHu5VRLLEvrUTFL9i61jG2qCARWBDMt9tGH8="; + }; + + vendorHash = "sha256-HupMxf8CXPhsnsQEnO1KsIJjY3l2jRJopQ2nVYhoYEE="; + + meta = { + description = "Implementation of the 9p2000 protocol in Go"; + homepage = "https://github.com/knusbaum/go9p"; + license = lib.licenses.mit; + mainProgram = "mount9p"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +} From 66d20ec16fc69c477c2a6ca309a4ebe3fe72deb2 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 17 Nov 2024 04:02:57 +0900 Subject: [PATCH 040/192] rubyPackages.ovirt-engine-sdk: set meta.broken --- pkgs/development/ruby-modules/gem-config/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index f358d47e2193..0c34601fd725 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -626,6 +626,7 @@ in ovirt-engine-sdk = attrs: { buildInputs = [ curl libxml2 ]; dontBuild = false; + meta.broken = stdenv.hostPlatform.isDarwin; # At least until releasing https://github.com/oVirt/ovirt-engine-sdk-ruby/pull/17 }; pango = attrs: { From 2a2670af0a628ddd91f8a80d217f4b33e2490605 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 19 Nov 2024 13:56:54 -0700 Subject: [PATCH 041/192] util-linux: fix FreeBSD build - disable some feature flags - a needed header is included guarded by __APPLE__. Change it for the FreeBSD build. - the explicit definition of _POSIX_C_SOURCE and _XOPEN_SOURCE to rather old versions in-source masks some needed declarations. Remove them. --- pkgs/by-name/ut/util-linux/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 6afae4dcc963..83c0789a15ea 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { '' + lib.optionalString shadowSupport '' substituteInPlace include/pathnames.h \ --replace "/bin/login" "${shadow}/bin/login" + '' + lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace lib/c_strtod.c --replace-fail __APPLE__ __FreeBSD__ + sed -E -i -e '/_POSIX_C_SOURCE/d' -e '/_XOPEN_SOURCE/d' misc-utils/hardlink.c ''; # !!! It would be better to obtain the path to the mount helpers @@ -75,6 +78,12 @@ stdenv.mkDerivation rec { "SYSCONFSTATICDIR=${placeholder "lib"}/lib" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "scanf_cv_type_modifier=ms" + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + # These features are all disabled in the freebsd-ports distribution + "--disable-nls" + "--disable-ipcrm" + "--disable-ipcs" + ] ; makeFlags = [ From 32e0d3a3da7547ec0d6c8af04e95e51979c95c80 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 20 Nov 2024 18:10:34 -0500 Subject: [PATCH 042/192] python312Packages.tensorly: unbreak (incorrect source hash) The hash observed by r-ryantm corresponds to one commit before the current 0.9.0 tag. --- pkgs/development/python-modules/tensorly/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 245791e71cd9..c36c540d5b3b 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -6,12 +6,13 @@ pytestCheckHook, pythonOlder, scipy, + setuptools, }: buildPythonPackage rec { pname = "tensorly"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,10 +20,12 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kj32N0hwdI/DS0WwpH4cr3xhq+3X53edodU3/SEorqw="; + hash = "sha256-A6Zlp8fa7XFgf4qpg7SEtNLlYSNtDGLuRUEfzD+crQc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy ]; @@ -40,6 +43,7 @@ buildPythonPackage rec { "tensorly.tenalg" "tensorly.decomposition" "tensorly.regression" + "tensorly.solvers" "tensorly.metrics" "tensorly.random" "tensorly.datasets" @@ -58,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tensor learning in Python"; homepage = "https://tensorly.org/"; + changelog = "https://github.com/tensorly/tensorly/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; From bf4c8fc53aa0a3c65a6930c0a411ba0f1a093f6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:59:33 +0100 Subject: [PATCH 043/192] python312Packages.pywerview: 0.7.0 -> 0.7.1 Diff: https://github.com/the-useless-one/pywerview/compare/refs/tags/v0.7.0...v0.7.1 Changelog: https://github.com/the-useless-one/pywerview/releases/tag/v0.7.1 --- pkgs/development/python-modules/pywerview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index 61ba21dc7586..b9096cffce8d 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pywerview"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "the-useless-one"; repo = "pywerview"; rev = "refs/tags/v${version}"; - hash = "sha256-G4kcKlb6bq9Vx52MVZ+DCN5k1QcvkoMXm9P959nA1fI="; + hash = "sha256-Mi06l6D3DSkz27resq9KingaXHK+lKn3W5VBLQahLO8="; }; build-system = [ setuptools ]; From ebc7f53961b371b84e3cf024bf56c14be2061a43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 12:06:26 +0100 Subject: [PATCH 044/192] python312Packages.yfinance: 0.2.49 -> 0.2.50 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.2.49...0.2.50 Changelog: https://github.com/ranaroussi/yfinance/blob/0.2.50/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 9d5fe8500840..4f3fa14e8559 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.49"; + version = "0.2.50"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-rZU7xMTVabXMOQYGJnZjkDcfegBzHNsx8VNPvKKWEIQ="; + hash = "sha256-qB9VbdiInbLEAy698BzU35k8ckwmaEXv8lByRsp/GfA="; }; build-system = [ setuptools ]; From c824630f080e5faaa7b45ba1893dfe12d5a1d3a1 Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sat, 4 May 2024 16:24:56 +0200 Subject: [PATCH 045/192] stackblur-go: init at 1.1.0 --- pkgs/by-name/st/stackblur-go/package.nix | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/st/stackblur-go/package.nix diff --git a/pkgs/by-name/st/stackblur-go/package.nix b/pkgs/by-name/st/stackblur-go/package.nix new file mode 100644 index 000000000000..eb97f4d51304 --- /dev/null +++ b/pkgs/by-name/st/stackblur-go/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "stackblur-go"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "esimov"; + repo = "stackblur-go"; + rev = "v${version}"; + hash = "sha256-y1Fov81mholhz+bLRYl+G7jhzcsFS5TUjQ3SUntD8E0="; + }; + + vendorHash = null; + + postInstall = '' + mv $out/bin/cmd $out/bin/stackblur + ''; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Fast, almost Gaussian Blur implementation in Go"; + homepage = "https://github.com/esimov/stackblur-go"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sodiboo ]; + mainProgram = "stackblur"; + }; +} From 4b4f8ece42c1b4e6cce00e92d2b01fda70f315b8 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Thu, 21 Nov 2024 23:45:36 +0100 Subject: [PATCH 046/192] google-cloud-sdk: fix gsutil --- pkgs/tools/admin/google-cloud-sdk/default.nix | 3 +++ .../gsutil-revert-version-constraint.patch | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/admin/google-cloud-sdk/gsutil-revert-version-constraint.patch diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 2064022d80c5..87cb27b57d19 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -43,6 +43,8 @@ in stdenv.mkDerivation rec { ./gcloud-path.patch # Disable checking for updates for the package ./gsutil-disable-updates.patch + # Revert patch including extended Python version constraint + ./gsutil-revert-version-constraint.patch ]; installPhase = '' @@ -120,6 +122,7 @@ in stdenv.mkDerivation rec { # Avoid trying to write logs to homeless-shelter export HOME=$(mktemp -d) $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}" + $out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)" ''; passthru = { diff --git a/pkgs/tools/admin/google-cloud-sdk/gsutil-revert-version-constraint.patch b/pkgs/tools/admin/google-cloud-sdk/gsutil-revert-version-constraint.patch new file mode 100644 index 000000000000..616e904cae4f --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/gsutil-revert-version-constraint.patch @@ -0,0 +1,21 @@ +diff --git a/platform/gsutil/gsutil.py b/platform/gsutil/gsutil.py +index 30b8a5ac..a02f0ba5 100755 +--- a/platform/gsutil/gsutil.py ++++ b/platform/gsutil/gsutil.py +@@ -27,14 +27,8 @@ import warnings + # TODO: gsutil-beta: Distribute a pylint rc file. + + ver = sys.version_info +-if (ver.major == 2 and ver.minor < 7) or (ver.major == 3 and (ver.minor < 5 or ver.minor > 11)): +- sys.exit( +- "Error: gsutil requires Python version 2.7 or 3.5-3.11, but a different version is installed.\n" +- "You are currently running Python {}.{}\n" +- "Follow the steps below to resolve this issue:\n" +- "\t1. Switch to Python 3.5-3.11 using your Python version manager or install an appropriate version.\n" +- "\t2. If you are unsure how to manage Python versions, visit [https://cloud.google.com/storage/docs/gsutil_install#specifications] for detailed instructions.".format(ver.major, ver.minor) +- ) ++if (ver.major == 2 and ver.minor < 7) or (ver.major == 3 and ver.minor < 5): ++ sys.exit('gsutil requires python 2.7 or 3.5+.') + + # setup a string to load the correct httplib2 + if sys.version_info.major == 2: From b158712025651ecedd87bd161a07ce0d02492094 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 22 Nov 2024 00:49:34 +0100 Subject: [PATCH 047/192] python312Packages.treescope: 0.1.5 -> 0.1.6 Diff: https://github.com/google-deepmind/treescope/compare/refs/tags/v0.1.5...v0.1.6 Changelog: https://github.com/google-deepmind/treescope/releases/tag/v0.1.6 --- pkgs/development/python-modules/treescope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treescope/default.nix b/pkgs/development/python-modules/treescope/default.nix index c27e95cdff38..48af7dc2c553 100644 --- a/pkgs/development/python-modules/treescope/default.nix +++ b/pkgs/development/python-modules/treescope/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "treescope"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "treescope"; rev = "refs/tags/v${version}"; - hash = "sha256-+Hm60O9tEXIiE0av1O0BsOdMln4e1s7ijb3WNiQ74jE="; + hash = "sha256-QlCKdsQk9VzRNnQKqWUIt6drocx++Aq34cMmZTw0UZw="; }; build-system = [ flit-core ]; From 14201d3a9d46f2b4362fe5ad3b08053830c25fd7 Mon Sep 17 00:00:00 2001 From: Katherine Jamison Date: Fri, 15 Nov 2024 13:41:56 -0700 Subject: [PATCH 048/192] desk-exec: init at 1.0.2 --- pkgs/by-name/de/desk-exec/package.nix | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/de/desk-exec/package.nix diff --git a/pkgs/by-name/de/desk-exec/package.nix b/pkgs/by-name/de/desk-exec/package.nix new file mode 100644 index 000000000000..61dfad8939b6 --- /dev/null +++ b/pkgs/by-name/de/desk-exec/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, + stdenv, +}: + +rustPlatform.buildRustPackage rec { + pname = "desk-exec"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "AxerTheAxe"; + repo = "desk-exec"; + rev = "refs/tags/v${version}"; + hash = "sha256-bJLdd07IAf+ba++vtS0iSmeQSGygwSVNry2bHTDAgjE="; + }; + + cargoHash = "sha256-pK1WDtGkpPZgFwEm59TqoH7EkKPQivNuvsiOG0dbum4="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + pushd target/${stdenv.hostPlatform.config}/release/dist + installShellCompletion desk-exec.{bash,fish} + installShellCompletion _desk-exec + installManPage desk-exec.1 + popd + ''; + + meta = { + description = "Execute programs defined in XDG desktop entries directly from the command line"; + homepage = "https://github.com/AxerTheAxe/desk-exec"; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.axertheaxe ]; + mainProgram = "desk-exec"; + platforms = lib.platforms.linux; + }; +} From 19b6c8ec2b25701858e2121bd6798508bba26b32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 09:05:10 +0100 Subject: [PATCH 049/192] python312Packages.azure-mgmt-appconfiguration: 3.1.0 -> 4.0.0 --- .../python-modules/azure-mgmt-appconfiguration/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index d933f721da39..35f2748f096f 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-appconfiguration"; - version = "3.1.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_appconfiguration"; inherit version; - hash = "sha256-BZbwnn54Qb6R3eHIGBNBALv6EkSG4GiJ0jndWHdEtHw="; + hash = "sha256-x9ItR8hiQrj311Lx3BgojaSsQcL2l0C5fe6AI58PDO4="; }; build-system = [ setuptools ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure App Configuration Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appconfiguration/azure-mgmt-appconfiguration"; - changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-appconfiguration_${version}/sdk/appconfiguration/azure-mgmt-appconfiguration"; + changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-appconfiguration_${version}/sdk/appconfiguration/azure-mgmt-appconfiguration/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; From 4c1bfb83b0921600f589dc32ca62df12af8d4c64 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Thu, 21 Nov 2024 17:38:24 +0800 Subject: [PATCH 050/192] biblioteca: init at 1.5 --- .../bi/biblioteca/dont-use-flatpak.patch | 38 +++++++ pkgs/by-name/bi/biblioteca/package.nix | 104 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 146 insertions(+) create mode 100644 pkgs/by-name/bi/biblioteca/dont-use-flatpak.patch create mode 100644 pkgs/by-name/bi/biblioteca/package.nix diff --git a/pkgs/by-name/bi/biblioteca/dont-use-flatpak.patch b/pkgs/by-name/bi/biblioteca/dont-use-flatpak.patch new file mode 100644 index 000000000000..17660c3b0a09 --- /dev/null +++ b/pkgs/by-name/bi/biblioteca/dont-use-flatpak.patch @@ -0,0 +1,38 @@ +From 46a92740dde0372fbe3e75a9a334ea79b6f53da1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +Date: Fri, 8 Nov 2024 00:04:01 +0100 +Subject: [PATCH] Don't check if running under Flatpak + +--- + src/bin.js | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/bin.js b/src/bin.js +index 5dcc3eb..362ce67 100755 +--- a/src/bin.js ++++ b/src/bin.js +@@ -3,7 +3,6 @@ + import { exit, programArgs } from "system"; + import GLib from "gi://GLib"; + import { setConsoleLogDomain } from "console"; +-import Xdp from "gi://Xdp"; + + // eslint-disable-next-line no-restricted-globals + imports.package.init({ +@@ -16,13 +15,6 @@ imports.package.init({ + setConsoleLogDomain(pkg.name); + GLib.set_application_name("Biblioteca"); + +-if (!Xdp.Portal.running_under_flatpak()) { +- console.error( +- "Flatpak required\nBiblioteca is only meant to be run sandboxed in a specific target environment.\nBypassing this will exposes users to arbitrary code breakage.", +- ); +- exit(1); +-} +- + globalThis.__DEV__ = pkg.name.endsWith(".Devel"); + if (__DEV__) { + pkg.sourcedir = "@sourcedir@"; +-- +2.47.0 + diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix new file mode 100644 index 000000000000..0224fdb45a69 --- /dev/null +++ b/pkgs/by-name/bi/biblioteca/package.nix @@ -0,0 +1,104 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + desktop-file-utils, + glib, + gjs, + blueprint-compiler, + pkg-config, + gtk4, + gobject-introspection, + libadwaita, + webkitgtk, + coreutils, + makeShellWrapper, + wrapGAppsHook4, + glib-networking, + symlinkJoin, + extraDocsPackage ? [ ], +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "biblioteca"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "workbenchdev"; + repo = "Biblioteca"; + rev = "refs/tags/v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-zrrI3u4ukGN6eb/eK/aZG4gi/xtXciyRS+JX9Js9KEw="; + }; + + patches = [ + ./dont-use-flatpak.patch # From https://gitlab.archlinux.org/archlinux/packaging/packages/biblioteca/-/blob/main/biblioteca-no-flatpak.patch?ref_type=heads + ]; + + nativeBuildInputs = [ + meson + ninja + desktop-file-utils + makeShellWrapper + gjs + wrapGAppsHook4 + pkg-config + ]; + + buildInputs = [ + glib + gtk4 + gobject-introspection + libadwaita + webkitgtk + glib-networking + ]; + + docPath = symlinkJoin { + name = "biblioteca-docs"; + paths = [ + gtk4.devdoc + glib.devdoc + libadwaita.devdoc + webkitgtk.devdoc + gobject-introspection.devdoc + ] ++ extraDocsPackage; + }; + + postPatch = '' + substituteInPlace src/meson.build \ + --replace-fail "/app/bin/blueprint-compiler" "${lib.getExe blueprint-compiler}" \ + + patchShebangs . + + substituteInPlace build-aux/build-index.js \ + --replace-fail "/usr/bin/env -S gjs -m" "${coreutils}/bin/env -S ${gjs}/bin/gjs -m" \ + --replace-fail "/app/share/doc" "${finalAttrs.docPath}/share/doc" + + substituteInPlace src/Shortcuts.js \ + --replace-fail "/app/share/doc" "${finalAttrs.docPath}/share/doc" + substituteInPlace src/window.blp \ + --replace-fail "/app/share/doc" "${finalAttrs.docPath}/share/doc" + substituteInPlace src/window.js \ + --replace-fail "/app/share/doc" "${finalAttrs.docPath}/share/doc" + ''; + + postInstall = '' + mv $out/bin/app.drey.Biblioteca $out/share/app.drey.Biblioteca/app.drey.Biblioteca + substituteInPlace $out/bin/biblioteca \ + --replace-fail app.drey.Biblioteca $out/share/app.drey.Biblioteca/app.drey.Biblioteca + ''; + + doCheck = true; + + meta = { + homepage = "https://apps.gnome.org/Biblioteca/"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.gpl3Only; + description = "Documentation viewer for GNOME"; + mainProgram = "biblioteca"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e81e5a54b2e..ab74d1479808 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19208,4 +19208,8 @@ with pkgs; tree-from-tags = callPackage ../by-name/tr/tree-from-tags/package.nix { ruby = ruby_3_1; }; + + biblioteca = callPackage ../by-name/bi/biblioteca/package.nix { + webkitgtk = webkitgtk_6_0; + }; } From f31a0f3ac17a57076cdf8ca6e4c0152fede38934 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 09:41:05 +0100 Subject: [PATCH 051/192] python312Packages.azure-servicemanagement-legacy: 0.20.7 -> 0.20.8 --- .../default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index bff86f69ba6b..6db4bc076a03 100644 --- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -1,35 +1,41 @@ { lib, + azure-common, buildPythonPackage, fetchPypi, - azure-common, requests, + setuptools, }: buildPythonPackage rec { - version = "0.20.7"; - format = "setuptools"; pname = "azure-servicemanagement-legacy"; + version = "0.20.8"; + pyproject = true; src = fetchPypi { - inherit version pname; - extension = "zip"; - sha256 = "1kcibw17qm8c02y28xabm3k1zrawi6g4q8kzc751l5l3vagqnf2x"; + pname = "azure_servicemanagement_legacy"; + inherit version; + hash = "sha256-42neKpeBjx26GTIzeBTyjTmj5tcNklNQoaBoEDjC+Xc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common requests ]; pythonNamespaces = [ "azure" ]; - # has no tests + + # Module has no tests doCheck = false; + pythonImportsCheck = [ "azure.servicemanagement" ]; meta = with lib; { description = "This is the Microsoft Azure Service Management Legacy Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-servicemanagement-legacy"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-servicemanagement-legacy_${version}/sdk/core/azure-servicemanagement-legacy/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ olcai From 15e63114eefc4c5eb2cccf8502b54983b14553ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 09:44:09 +0100 Subject: [PATCH 052/192] python312Packages.tencentcloud-sdk-python: 3.0.1268 -> 3.0.1269 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1268...3.0.1269 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1269/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index b894bd1c1bf9..099dfcdd6bd4 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1268"; + version = "3.0.1269"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-668fJLHnxle3eOQf62D1lbVJnP/ukoBSiENrkxQB9oU="; + hash = "sha256-e1i/c6oqxQr5nJG4KW03mmsdrbBR0u6QEqI+jtMQnQg="; }; build-system = [ setuptools ]; From e35cabfdd608f6c622470fc3d796db41353aa41f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 09:58:36 +0100 Subject: [PATCH 053/192] knockpy: 7.0.1 -> 7.0.2 Diff: https://github.com/guelfoweb/knock/compare/refs/tags/7.0.1...7.0.2 Changelog: https://github.com/guelfoweb/knock/releases/tag/7.0.2 --- pkgs/by-name/kn/knockpy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kn/knockpy/package.nix b/pkgs/by-name/kn/knockpy/package.nix index c3ed52db593b..e523795d93b3 100644 --- a/pkgs/by-name/kn/knockpy/package.nix +++ b/pkgs/by-name/kn/knockpy/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "7.0.1"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = "refs/tags/${version}"; - hash = "sha256-ALsSpygJlqYW/7Z44PZmBcIxfrtOPPrvuuMIOyFE5kE="; + hash = "sha256-tJNosM8zGzH0uMvVawoBl2d+8xkVzTIjycnHHjnMzSo="; }; pythonRelaxDeps = [ From 83116f631e0bed5d64833a34209bdf76855f3b66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:00:04 +0100 Subject: [PATCH 054/192] python312Packages.faraday-plugins: 1.19.1 -> 1.20.0 Diff: https://github.com/infobyte/faraday_plugins/compare/refs/tags/1.19.1...1.20.0 Changelog: https://github.com/infobyte/faraday_plugins/releases/tag/1.20.0 --- pkgs/development/python-modules/faraday-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 9111890efd0f..16f506f5ab0d 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.19.1"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-XWPj348kAuA9BF7Y2/hX712eLRfUZ9kH3oL1jb17/K0="; + hash = "sha256-e1VrZf0WNUZ5gU5e4uBkW8PgfQrqGgqqDb0n56nm1Xg="; }; postPatch = '' From ec6e7e47abcfdb93ed2fc911b1d8737d207f4e8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:03:24 +0100 Subject: [PATCH 055/192] python312Packages.mypy-boto3-apigateway: 1.35.25 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 662399de3c77..ca789e4bb69f 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -78,8 +78,8 @@ rec { "sha256-/muCi4o6A3bmAvc4w5lSla9ZtE3rMkJoL3LlEjzKoms="; mypy-boto3-apigateway = - buildMypyBoto3Package "apigateway" "1.35.25" - "sha256-6jtBmuho1j8GE+6sxqdYYf1XtonWoUu3Vi7tMDkTpa4="; + buildMypyBoto3Package "apigateway" "1.35.67" + "sha256-fuTglXzTZ/cumu5avbL3tc79wdohThknLvZ0HQIAKZ8="; mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.35.0" From f361b678346e5f12b76210aad6a3938706748d55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:03:28 +0100 Subject: [PATCH 056/192] python312Packages.mypy-boto3-application-autoscaling: 1.35.0 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index ca789e4bb69f..3dbe7c57d88b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -110,8 +110,8 @@ rec { "sha256-aPoEEfQvhPoT0CPcfoyhzdXl2jSKeIoD3gBEw1f1XWU="; mypy-boto3-application-autoscaling = - buildMypyBoto3Package "application-autoscaling" "1.35.0" - "sha256-JsQYZqlzCM64Uxk3btQZm8dX/oSHsy1l29dUG7n025s="; + buildMypyBoto3Package "application-autoscaling" "1.35.67" + "sha256-vIhEkUkeI0Wx16/MLVylDuAPV62gwYjtTp9hqJdqFD4="; mypy-boto3-application-insights = buildMypyBoto3Package "application-insights" "1.35.45" From b808ad854a09dfd30f37f5d31381a6ff8866eea5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:03:31 +0100 Subject: [PATCH 057/192] python312Packages.mypy-boto3-appsync: 1.35.52 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 3dbe7c57d88b..37a88a75e94b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -134,8 +134,8 @@ rec { "sha256-HK2Eh7uNihu+st+A51z+3uYlPacOkpp7Ic3+xIWHhJ0="; mypy-boto3-appsync = - buildMypyBoto3Package "appsync" "1.35.52" - "sha256-KT61EeM5e0ZioxRrWW0EbKdmDuEgsWbuZoWz9FGLIt0="; + buildMypyBoto3Package "appsync" "1.35.67" + "sha256-kOChUtLeRR8uNb27GRv1FA2rfNasJttpmTowJsvW1yA="; mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.35.0" From b0d71d72d322fd5e369df706a3a4492e9bcab92e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:03:37 +0100 Subject: [PATCH 058/192] python312Packages.mypy-boto3-ce: 1.35.22 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 37a88a75e94b..2fe0d88ab2b0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -182,8 +182,8 @@ rec { "sha256-WJ0Vjppi+dDYwqL3Xu+VWc+KIbhc9CHzAU3C5x5eTHA="; mypy-boto3-ce = - buildMypyBoto3Package "ce" "1.35.22" - "sha256-1MB5ldBGqYDZMkYaEJ0nK+jM5q/TkcN3wllT1X8YnQc="; + buildMypyBoto3Package "ce" "1.35.67" + "sha256-9SL7kKyn4xpLpgiZ9jDFaid+8cbEIEIoIgTYsf4XAIo="; mypy-boto3-chime = buildMypyBoto3Package "chime" "1.35.0" From 9e968dd14ac42da1883318994eb9553eccf5ba73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:03:42 +0100 Subject: [PATCH 059/192] python312Packages.mypy-boto3-cloudfront: 1.35.66 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 2fe0d88ab2b0..b43e3575e0db 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -230,8 +230,8 @@ rec { "sha256-0aFQDfgRrI69RZZA9bMcFNqseE2KAPxPZ7xus5Hntag="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.35.66" - "sha256-pv5dVwGAe2CgnVDcg1s7ysUhtHsK+SQN/6m3NtMXusc="; + buildMypyBoto3Package "cloudfront" "1.35.67" + "sha256-xuksED7hax1O0nt6PXr3VgfR/toovYCL3rMYf4l4DMw="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.35.0" From f8416b62767cdb1e6021ef38b8db4e00afc183a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:03:45 +0100 Subject: [PATCH 060/192] python312Packages.mypy-boto3-cloudtrail: 1.35.60 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b43e3575e0db..013db404abfe 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -250,8 +250,8 @@ rec { "sha256-8QLyd1uCh26njr6VnNBFROHWFXMSvpO7WRzV8DFZ01U="; mypy-boto3-cloudtrail = - buildMypyBoto3Package "cloudtrail" "1.35.60" - "sha256-DuFNdYU7QrUczvCd1mU9jnPBkGfwpskj9F6gSYwJYnA="; + buildMypyBoto3Package "cloudtrail" "1.35.67" + "sha256-1gS61PsUJ10PczmHvs/OmCoJj9ZCgVbDWpB/8VwNkGg="; mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.35.0" From d2187dace25ec324a406b7de6370a8b9808b5287 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:04 +0100 Subject: [PATCH 061/192] python312Packages.mypy-boto3-ec2: 1.35.66 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 013db404abfe..30d7efe820e4 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.66" - "sha256-SrS3g6U8vP1rKN0ISPcaXsf8a8VFtmhF6GYXTG29/+o="; + buildMypyBoto3Package "ec2" "1.35.67" + "sha256-lcm+V2h0cVogSktbLJd1duPUYaHvDTVKVFJIhfbbZrc="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" From 244fafddce9856c0fc4f66562cb2f99c578d08c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:08 +0100 Subject: [PATCH 062/192] python312Packages.mypy-boto3-elasticache: 1.35.36 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 30d7efe820e4..f210d8e7a805 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -478,8 +478,8 @@ rec { "sha256-D+Ecu2+03ua8vs8C2NdGtDVSUpyM0SozHIb2PbRO2+g="; mypy-boto3-elasticache = - buildMypyBoto3Package "elasticache" "1.35.36" - "sha256-pLGZiHH9nyv0jzS4kWUw9BUMjsSR9X/i0VKIUkIeohs="; + buildMypyBoto3Package "elasticache" "1.35.67" + "sha256-/L1W2gdMBtYGfscuBhY+ib/Hac8Rm9TmMUaNzjmwEPA="; mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.35.0" From 328d46650d623a65deb3680e2598c900d1e96fe9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:10 +0100 Subject: [PATCH 063/192] python312Packages.mypy-boto3-elbv2: 1.35.66 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index f210d8e7a805..fcd81e4380ca 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -494,8 +494,8 @@ rec { "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.35.66" - "sha256-f2o9uGQF2dRZ3xUtAwWcTV+g4VbDphexuW2kn/Ik+9k="; + buildMypyBoto3Package "elbv2" "1.35.67" + "sha256-S0G/DN8gJUv94kvgfBi6VyY/V2LPe573BZ6tKE/lWQI="; mypy-boto3-emr = buildMypyBoto3Package "emr" "1.35.39" From 751e1331369540f8c0d7519c75b7a2826ccb2dd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:21 +0100 Subject: [PATCH 064/192] python312Packages.mypy-boto3-health: 1.35.0 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index fcd81e4380ca..d59cdc24e3c7 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -598,8 +598,8 @@ rec { "sha256-4iTPGfSTkel+xJtH/7/oPxbtmuZJk6p9FrZR3rKMaLA="; mypy-boto3-health = - buildMypyBoto3Package "health" "1.35.0" - "sha256-k0c7P8ozVzHSyMAGLg5arVjr+bABfZFwFU4EBQZufUA="; + buildMypyBoto3Package "health" "1.35.67" + "sha256-KHRzG6fMBQ1sXwQ9T3jJ/x6mdxixf72P0QscymUV7P0="; mypy-boto3-healthlake = buildMypyBoto3Package "healthlake" "1.35.0" From cc5ecbca2e40c9496e1adcf3a3b7560ec2234452 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:25 +0100 Subject: [PATCH 065/192] python312Packages.mypy-boto3-iot: 1.35.63 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index d59cdc24e3c7..4b8c55676d1e 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -634,8 +634,8 @@ rec { "sha256-499CCePEtUnJhk3GJJ/BWhpYY5smN91yp3WuSnYBXJo="; mypy-boto3-iot = - buildMypyBoto3Package "iot" "1.35.63" - "sha256-Fj0ZKzDHx4t2qmroAbHfg1zXQ17CjKXiozROSLsoC4Y="; + buildMypyBoto3Package "iot" "1.35.67" + "sha256-zFh47jnp5s7VrchZEKS0m1aMjlicaNwmt2o2LrChe+k="; mypy-boto3-iot-data = buildMypyBoto3Package "iot-data" "1.35.34" From 2e2a7838820e7ace575cb29261f79afce92b9e60 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:27 +0100 Subject: [PATCH 066/192] python312Packages.mypy-boto3-iot-jobs-data: 1.35.0 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4b8c55676d1e..8cebb712dfd7 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -642,8 +642,8 @@ rec { "sha256-A12VYkybT23+1iCquQ9hY0voaqFdVCP7MQBdYLNzqhk="; mypy-boto3-iot-jobs-data = - buildMypyBoto3Package "iot-jobs-data" "1.35.0" - "sha256-pHVZNE6mAr/IJrM/jY8fiEt1o8hQOJ1aw+oKuKijpyU="; + buildMypyBoto3Package "iot-jobs-data" "1.35.67" + "sha256-aMIKgwuGXiAQ4vXcgp11XRJqNBfdOgzt+57HAtlHLrs="; mypy-boto3-iot1click-devices = buildMypyBoto3Package "iot1click-devices" "1.35.0" From d4c487067317f4cafa9a822221f544ca5f8edbfb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:32 +0100 Subject: [PATCH 067/192] python312Packages.mypy-boto3-iotfleetwise: 1.35.51 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 8cebb712dfd7..01326331439d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -674,8 +674,8 @@ rec { "sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k="; mypy-boto3-iotfleetwise = - buildMypyBoto3Package "iotfleetwise" "1.35.51" - "sha256-ZfS7CCrU0ZJipWUuyle1uws3IgN27XWOOwR4SAAO+zg="; + buildMypyBoto3Package "iotfleetwise" "1.35.67" + "sha256-LFhzVLxycvIbGPCIMvD18XAL8KkA1rnE+3LkFty4Q8s="; mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.35.0" From 9d7eb9671236dc4c1daece910f0da0d711890200 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:42 +0100 Subject: [PATCH 068/192] python312Packages.mypy-boto3-lambda: 1.35.66 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 01326331439d..b79a51945f94 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -770,8 +770,8 @@ rec { "sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.35.66" - "sha256-JOU9kpDiRxbwwf01H0BfQcVftHmHGEOXHBrYIdi5NoQ="; + buildMypyBoto3Package "lambda" "1.35.67" + "sha256-avtzRiTIq4GbZkxOOfzk8FRycvOD2xBf9UK5LPPwORc="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.35.0" From 958ada22f0ed0f46212e246d97cb4ebf635b19b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:04:47 +0100 Subject: [PATCH 069/192] python312Packages.mypy-boto3-logs: 1.35.54 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b79a51945f94..45fb201ac6ed 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -810,8 +810,8 @@ rec { "sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM="; mypy-boto3-logs = - buildMypyBoto3Package "logs" "1.35.54" - "sha256-RnHt15tR/cGO0w9mLYbCW0T82fyhVsJbBkfxSwDZItw="; + buildMypyBoto3Package "logs" "1.35.67" + "sha256-zyKW1rPjwwXr2B+9L72BlZbpdWHjWfCHberXoA5VQZQ="; mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.35.0" From a5c155d7c819aa9099ceb798893e46607f953a0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:05:17 +0100 Subject: [PATCH 070/192] python312Packages.mypy-boto3-resiliencehub: 1.35.41 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 45fb201ac6ed..c260675184a2 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1110,8 +1110,8 @@ rec { "sha256-mG3TeywuB5+87Z3nhqjFwf0y2WO49oETPMz+oL0LbOA="; mypy-boto3-resiliencehub = - buildMypyBoto3Package "resiliencehub" "1.35.41" - "sha256-zqBEwEnaCrmUl9xRlYOQHFSwZcXR1zj42Pd0Lik9SIQ="; + buildMypyBoto3Package "resiliencehub" "1.35.67" + "sha256-K5GgeoXGfy/RfZFRStEcbRhsbkfPQCXX/R5NFVXP4JU="; mypy-boto3-resource-explorer-2 = buildMypyBoto3Package "resource-explorer-2" "1.35.56" From d13b4947612e4034c2164ffcc207901c2936e692 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:05:22 +0100 Subject: [PATCH 071/192] python312Packages.mypy-boto3-s3: 1.35.61 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index c260675184a2..4cf9a56a5354 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1162,8 +1162,8 @@ rec { "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.61" - "sha256-aWX+bF89g2KseJVmNUCETtKciFySpiIzwpocAxyijJA="; + buildMypyBoto3Package "s3" "1.35.67" + "sha256-rtfS6OOE1A59exAxKTtPma2U7y6qGrx8GqBgqZlu6Zs="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.55" From d3bb3b156344167700ddd48a63db55998c02f83d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:05:36 +0100 Subject: [PATCH 072/192] python312Packages.mypy-boto3-ssm: 1.35.21 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4cf9a56a5354..a2020d3befe4 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1294,8 +1294,8 @@ rec { "sha256-YXUvHCvy76OBX2TUPCW0o529vZ5HKuSKoY18bSp6brg="; mypy-boto3-ssm = - buildMypyBoto3Package "ssm" "1.35.21" - "sha256-XtVcdQn63aYVVxj+WXKbPasPi3b/HgN6h6v/ndJHX0k="; + buildMypyBoto3Package "ssm" "1.35.67" + "sha256-2rgIDgA+Y7HY35B4absPFgiuUcNe/dqixruD40uIkag="; mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.35.0" From 6a134a888ad4e868225638b3c9a6fd09710b2d65 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:05:50 +0100 Subject: [PATCH 073/192] python312Packages.mypy-boto3-xray: 1.35.0 -> 1.35.67 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index a2020d3befe4..67694f8a1152 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1434,6 +1434,6 @@ rec { "sha256-36tsFJx1Q5vVGfdkHflOfd6r2rTqSmQzN+O1JBtJ1iI="; mypy-boto3-xray = - buildMypyBoto3Package "xray" "1.35.0" - "sha256-o8Om2D9ln23E2/OSrBSBApr2uUHpSF6kh4u/YOM4+Cw="; + buildMypyBoto3Package "xray" "1.35.67" + "sha256-NqSht3gndwAQg1UczYRElvcbQhIv5MP5X8Cp1RKnMX8="; } From 362df5e3cf27c27ecdaa0b5aba1643306e28a71e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Nov 2024 10:16:02 +0100 Subject: [PATCH 074/192] python312Packages.pysmi: 1.5.4 -> 1.5.9 Diff: https://github.com/lextudio/pysmi/compare/refs/tags/v1.5.4...v1.5.9 Changelog: https://github.com/lextudio/pysmi/blob/v1.5.9/CHANGES.rst --- pkgs/development/python-modules/pysmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index c1284b2c793e..c9758295a5b4 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - version = "1.5.4"; + version = "1.5.9"; pname = "pysmi"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lextudio"; repo = "pysmi"; rev = "refs/tags/v${version}"; - hash = "sha256-QKxUV2QTaGkCQmWTS8GBeaXKsKTIsrDVZFwidTqLdh0="; + hash = "sha256-cAeLoDwAf56aWWKKUjOB0fpy7C3gBJchJJtQ6986thc="; }; build-system = [ poetry-core ]; From 205b85c7dee809b1880cf3400ff577e55d96a8ce Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 10:38:06 +0000 Subject: [PATCH 075/192] libretro: make it a scope --- pkgs/applications/emulators/retroarch/cores.nix | 17 +++++++---------- .../emulators/retroarch/mkLibretroCore.nix | 6 +++--- pkgs/top-level/all-packages.nix | 9 +++------ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index f30d55ee4395..b113dbd9f666 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -1,4 +1,5 @@ { lib +, newScope , stdenv , gcc12Stdenv , alsa-lib @@ -30,7 +31,6 @@ , libxml2 , libxmp , libzip -, makeWrapper , mpg123 , nasm , openssl @@ -40,7 +40,6 @@ , pkg-config , portaudio , python3 -, retroarch , sfml , snappy , speexdsp @@ -49,7 +48,6 @@ , xorg , xxd , xz -, zlib }: let @@ -67,7 +65,8 @@ let fetcherFn src; getCoreVersion = repo: (getCore repo).version; - +in +lib.makeScope newScope (self: rec { mkLibretroCore = # Sometimes core name != repo name, so you may need to set them differently # when necessary: @@ -82,12 +81,10 @@ let , version ? (getCoreVersion repo) , ... }@args: - import ./mkLibretroCore.nix ({ - inherit lib stdenv core repo src version makeWrapper retroarch zlib; + self.callPackage ./mkLibretroCore.nix ({ + inherit core repo src version; + retroarch = self.retroarchBare; } // args); -in -{ - inherit mkLibretroCore; atari800 = mkLibretroCore { core = "atari800"; @@ -1168,4 +1165,4 @@ in license = lib.licenses.gpl2Only; }; }; -} +}) diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index bf933bf70159..1d4a6ade42d3 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -3,7 +3,7 @@ , core , repo , makeWrapper -, retroarch +, retroarchBare , zlib , makefile ? "Makefile.libretro" , extraBuildInputs ? [ ] @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ runHook preInstall install -Dt ${coreDir} ${coreFilename} - makeWrapper ${retroarch}/bin/retroarch $out/bin/${mainProgram} \ + makeWrapper ${retroarchBare}/bin/retroarch $out/bin/${mainProgram} \ --add-flags "-L ${coreDir}/${coreFilename}" runHook postInstall @@ -78,7 +78,7 @@ stdenv.mkDerivation ({ meta = with lib; { inherit mainProgram; - inherit (retroarch.meta) platforms; + inherit (retroarchBare.meta) platforms; homepage = "https://www.libretro.com/"; maintainers = with maintainers; teams.libretro.members ++ [ hrdinka ]; } // (args.meta or { }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3aa1e178d9e..a0d1954f1a1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1480,12 +1480,7 @@ with pkgs; retroarch-joypad-autoconfig = callPackage ../applications/emulators/retroarch/retroarch-joypad-autoconfig.nix { }; - libretranslate = with python3.pkgs; toPythonApplication libretranslate; - - libretro = recurseIntoAttrs - (callPackage ../applications/emulators/retroarch/cores.nix { - retroarch = retroarchBare; - }); + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { }); libretro-core-info = callPackage ../applications/emulators/retroarch/libretro-core-info.nix { }; @@ -10020,6 +10015,8 @@ with pkgs; python = python3; }; + libretranslate = with python3.pkgs; toPythonApplication libretranslate; + librsb = callPackage ../development/libraries/librsb { # Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K"; From 654cf1989a19c97e2225fd04de6ccee440ecb077 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 10:47:56 +0000 Subject: [PATCH 076/192] libretro.atari800: unstable-2024-10-01 -> 0-unstable-2024-10-31, move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/atari800.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/atari800.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index b113dbd9f666..fc9922ca23d3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -83,18 +83,9 @@ lib.makeScope newScope (self: rec { }@args: self.callPackage ./mkLibretroCore.nix ({ inherit core repo src version; - retroarch = self.retroarchBare; } // args); - atari800 = mkLibretroCore { - core = "atari800"; - makefile = "Makefile"; - makeFlags = [ "GIT_VERSION=" ]; - meta = { - description = "Port of Atari800 to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + atari800 = self.callPackage ./cores/atari800.nix { }; beetle-gba = mkLibretroCore { core = "mednafen-gba"; diff --git a/pkgs/applications/emulators/retroarch/cores/atari800.nix b/pkgs/applications/emulators/retroarch/cores/atari800.nix new file mode 100644 index 000000000000..d749224cb248 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/atari800.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore rec { + core = "atari800"; + version = "0-unstable-2024-10-31"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-atari800"; + rev = "6a18cb23cc4a7cecabd9b16143d2d7332ae8d44b"; + hash = "sha256-+cZXHtaXnpU/zCwiDtjkyNMFGDahiHzqV2FoTCRnUWE="; + }; + + makefile = "Makefile"; + makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; + + meta = { + description = "Port of Atari800 to libretro"; + homepage = "https://github.com/libretro/libretro-atari800"; + license = lib.licenses.gpl2Only; + }; +} From 36b0d8f9ece3d47bb5797bf52c7afc904c6dbb88 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 10:54:19 +0000 Subject: [PATCH 077/192] libretro.beetle-gba: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------ .../emulators/retroarch/cores/beetle-gba.nix | 28 +++++++++++++++++++ .../emulators/retroarch/mkLibretroCore.nix | 6 ++-- 3 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-gba.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index fc9922ca23d3..046fccc0eeac 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -87,15 +87,7 @@ lib.makeScope newScope (self: rec { atari800 = self.callPackage ./cores/atari800.nix { }; - beetle-gba = mkLibretroCore { - core = "mednafen-gba"; - repo = "beetle-gba"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's GameBoy Advance core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-gba = self.callPackage ./cores/beetle-gba.nix { }; beetle-lynx = mkLibretroCore { core = "mednafen-lynx"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix b/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix new file mode 100644 index 000000000000..22ce05982d23 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-gba"; + version = "0-unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-gba-libretro"; + rev = "6cee80685f735ea6c2373db2622a1f1ee9f39d39"; + hash = "sha256-a3XgExXVCUFw3GLCUkEl6now2L8qVdNOaXvrDMcT1ZE="; + }; + + makefile = "Makefile"; + + # TODO: move this to mkLibretroCore + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Port of Mednafen's GameBoy Advance core to libretro"; + homepage = "https://github.com/libretro/beetle-gba-libretro"; + license = lib.licenses.gpl2Only; + }; +} diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index 1d4a6ade42d3..86f05d6895e3 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -1,7 +1,7 @@ { lib , stdenv , core -, repo +, repo ? null # TODO: remove , makeWrapper , retroarchBare , zlib @@ -73,8 +73,8 @@ stdenv.mkDerivation ({ passthru = { inherit core libretroCore; - updateScript = [ ./update_cores.py repo ]; - }; + updateScript = lib.mkIf (repo != null) [ ./update_cores.py repo ]; + } // (args.passthru or { }); meta = with lib; { inherit mainProgram; From 9ead44754bdc42a5fb36fd80f3c4d9d661efbe98 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:08:17 +0000 Subject: [PATCH 078/192] libretro.beetle-lynx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-lynx.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 046fccc0eeac..a5d5382c0de0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -89,15 +89,7 @@ lib.makeScope newScope (self: rec { beetle-gba = self.callPackage ./cores/beetle-gba.nix { }; - beetle-lynx = mkLibretroCore { - core = "mednafen-lynx"; - repo = "beetle-lynx"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's Lynx core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-lynx = self.callPackage ./cores/beetle-lynx.nix { }; beetle-ngp = mkLibretroCore { core = "mednafen-ngp"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix new file mode 100644 index 000000000000..502d8c5df34f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-lynx"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-lynx-libretro"; + rev = "7fead71b49e0f08be5c4d4224fea73c6174763bf"; + hash = "sha256-fYBx/bjbhRXoVIGnEg4/oMVm705ivL1os+FfVQLRSyI="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's Lynx core to libretro"; + homepage = "https://github.com/libretro/beetle-lynx-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 1066bbd6a401e5e07b0f4a7bb183d9f2930de03e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:37:45 +0000 Subject: [PATCH 079/192] libretro.beetle-ngp: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-ngp.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index a5d5382c0de0..aaca31f33272 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -91,15 +91,7 @@ lib.makeScope newScope (self: rec { beetle-lynx = self.callPackage ./cores/beetle-lynx.nix { }; - beetle-ngp = mkLibretroCore { - core = "mednafen-ngp"; - repo = "beetle-ngp"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's NeoGeo Pocket core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-ngp = self.callPackage ./cores/beetle-ngp.nix { }; beetle-pce = mkLibretroCore { core = "mednafen-pce"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix b/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix new file mode 100644 index 000000000000..6c86135282ad --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-ngp"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-ngp-libretro"; + rev = "139fe34c8dfc5585d6ee1793a7902bca79d544de"; + hash = "sha256-ruWnCgMxfpPHTWQ7vgNUczmGRzNKKhoZTNlUcNgm4T8="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's NeoGeo Pocket core to libretro"; + homepage = "https://github.com/libretro/beetle-ngp-libretro"; + license = lib.licenses.gpl2Only; + }; +} From a00a3734e052e89900be481a46d4935a64d4f9ab Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:39:35 +0000 Subject: [PATCH 080/192] libretro.mednafen-pce: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-pce.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-pce.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index aaca31f33272..09917bbdbd0d 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -93,15 +93,7 @@ lib.makeScope newScope (self: rec { beetle-ngp = self.callPackage ./cores/beetle-ngp.nix { }; - beetle-pce = mkLibretroCore { - core = "mednafen-pce"; - repo = "beetle-pce"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's PC Engine core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-pce = self.callPackage ./cores/beetle-pce.nix { }; beetle-pce-fast = mkLibretroCore { core = "mednafen-pce-fast"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix new file mode 100644 index 000000000000..934ff1e0ba0d --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-pce"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-pce-libretro"; + rev = "af28fb0385d00e0292c4703b3aa7e72762b564d2"; + hash = "sha256-W+74RTIidSUdviihLy926OvlSdqMECvOLEEiWMtB50w="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's PC Engine core to libretro"; + homepage = "https://github.com/libretro/beetle-pce-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 36ec2ddc20afed4413616554aa15584642a4a556 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:48:14 +0000 Subject: [PATCH 081/192] libretro.beetle-pce-fast: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/beetle-pce-fast.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 09917bbdbd0d..3860a11cb142 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -95,15 +95,7 @@ lib.makeScope newScope (self: rec { beetle-pce = self.callPackage ./cores/beetle-pce.nix { }; - beetle-pce-fast = mkLibretroCore { - core = "mednafen-pce-fast"; - repo = "beetle-pce-fast"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's PC Engine fast core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-pce-fast = self.callPackage ./cores/beetle-pce-fast.nix { }; beetle-pcfx = mkLibretroCore { core = "mednafen-pcfx"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix new file mode 100644 index 000000000000..1af81b8c3c27 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-pce-fast"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-pce-fast-libretro"; + rev = "931586f0512663f625a6e981d3047a6620281ab5"; + hash = "sha256-9Nne4upiQNSAlTZsyXcLNIwN8MMKUO1ycahowYW1sWg="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's PC Engine fast core to libretro"; + homepage = "https://github.com/libretro/beetle-pce-fast-libretro"; + license = lib.licenses.gpl2Only; + }; +} From dc0eba7c0ddb389db60de2597b22064f3b5d608f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:55:15 +0000 Subject: [PATCH 082/192] libretro.beetle-pcfx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-pcfx.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 3860a11cb142..00a1ef9cad22 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -97,15 +97,7 @@ lib.makeScope newScope (self: rec { beetle-pce-fast = self.callPackage ./cores/beetle-pce-fast.nix { }; - beetle-pcfx = mkLibretroCore { - core = "mednafen-pcfx"; - repo = "beetle-pcfx"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's PCFX core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-pcfx = self.callPackage ./cores/beetle-pcfx.nix { }; beetle-psx = mkLibretroCore { core = "mednafen-psx"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix new file mode 100644 index 000000000000..d53405fb3cb2 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-pcfx"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-pcfx-libretro"; + rev = "dd04cef9355286488a1d78ff18c4c848a1575540"; + hash = "sha256-oFBuriCbJWjgPH9RRAM/XUvkW0gKXnvs7lmBpJpWewo="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's PCFX core to libretro"; + homepage = "https://github.com/libretro/beetle-pcfx-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 174f6501e10c4d806cbcebcf058b2ce937f8ceb2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:07:37 +0000 Subject: [PATCH 083/192] libretro.beetle-psx{,-hw}: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 23 +---------- .../emulators/retroarch/cores/beetle-psx.nix | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-psx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 00a1ef9cad22..24e7f2f7e682 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -99,28 +99,9 @@ lib.makeScope newScope (self: rec { beetle-pcfx = self.callPackage ./cores/beetle-pcfx.nix { }; - beetle-psx = mkLibretroCore { - core = "mednafen-psx"; - repo = "beetle-psx"; - makefile = "Makefile"; - makeFlags = [ "HAVE_HW=0" "HAVE_LIGHTREC=1" ]; - meta = { - description = "Port of Mednafen's PSX Engine core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-psx = self.callPackage ./cores/beetle-psx.nix { }; - beetle-psx-hw = mkLibretroCore { - core = "mednafen-psx-hw"; - repo = "beetle-psx"; - extraBuildInputs = [ libGL libGLU ]; - makefile = "Makefile"; - makeFlags = [ "HAVE_VULKAN=1" "HAVE_OPENGL=1" "HAVE_HW=1" "HAVE_LIGHTREC=1" ]; - meta = { - description = "Port of Mednafen's PSX Engine (with HW accel) core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-psx-hw = self.beetle-psx.override { withHw = true; }; beetle-saturn = mkLibretroCore { core = "mednafen-saturn"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix new file mode 100644 index 000000000000..2c76381d3bb4 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix @@ -0,0 +1,38 @@ +{ + lib, + libGL, + libGLU, + fetchFromGitHub, + mkLibretroCore, + withHw ? false, +}: +mkLibretroCore { + core = "mednafen-psx" + lib.optionalString withHw "-hw"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-psx-libretro"; + rev = "1068cb8dbd6f312664ecf5901625cab4a6533204"; + hash = "sha256-ioAnpz6OkHWPaYE0uTEvnHV+vGzq02bQ4oUP8jW6/YA="; + }; + + extraBuildInputs = lib.optionals withHw [ + libGL + libGLU + ]; + + makefile = "Makefile"; + makeFlags = [ + "HAVE_HW=${if withHw then "1" else "0"}" + "HAVE_LIGHTREC=1" + ]; + + meta = { + description = + "Port of Mednafen's PSX Engine core to libretro" + + lib.optionalString withHw " (with hardware acceleration support)"; + homepage = "https://github.com/libretro/beetle-psx-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 53e34f0721098ac7cf276e2ce44e862e9063eba8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:10:55 +0000 Subject: [PATCH 084/192] libretro.beetle-saturn: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../retroarch/cores/beetle-saturn.nix | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 24e7f2f7e682..cd49e0d1a88c 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -103,16 +103,7 @@ lib.makeScope newScope (self: rec { beetle-psx-hw = self.beetle-psx.override { withHw = true; }; - beetle-saturn = mkLibretroCore { - core = "mednafen-saturn"; - repo = "beetle-saturn"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's Saturn core to libretro"; - license = lib.licenses.gpl2Only; - platforms = [ "aarch64-linux" "x86_64-linux" ]; - }; - }; + beetle-saturn = self.callPackage ./cores/beetle-saturn.nix { }; beetle-supafaust = mkLibretroCore { core = "mednafen-supafaust"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix b/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix new file mode 100644 index 000000000000..196453f1a171 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-saturn"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-saturn-libretro"; + rev = "0a78a9a5ab0088ba19f21e028dda9f4b4d7c9e48"; + hash = "sha256-WNQhtaYBg7JqPdxcD0cLRjr2pSda6Xmx/WWYzyu5u9c="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's Saturn core to libretro"; + homepage = "https://github.com/libretro/beetle-saturn-libretro"; + license = lib.licenses.gpl2Only; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} From ba415c8b021fb97c93a6ba74de6ac6d05b49929c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:15:18 +0000 Subject: [PATCH 085/192] libretro.beetle-supafaust: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/beetle-supafaust.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index cd49e0d1a88c..d4c83678d224 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -105,15 +105,7 @@ lib.makeScope newScope (self: rec { beetle-saturn = self.callPackage ./cores/beetle-saturn.nix { }; - beetle-supafaust = mkLibretroCore { - core = "mednafen-supafaust"; - repo = "beetle-supafaust"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's experimental snes_faust core to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + beetle-supafaust = self.callPackage ./cores/beetle-supafaust.nix { }; beetle-supergrafx = mkLibretroCore { core = "mednafen-supergrafx"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix b/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix new file mode 100644 index 000000000000..6f3f9537a00f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-supafaust"; + version = "unstable-2024-10-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "supafaust"; + rev = "e25f66765938d33f9ad5850e8d6cd597e55b7299"; + hash = "sha256-ZgOXHhEHt54J2B1q6uA8v6uOK53g7idJlgoC4guTGow="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's experimental snes_faust core to libretro"; + homepage = "https://github.com/libretro/supafaust"; + license = lib.licenses.gpl2Only; + }; +} From 72140b806d9d211572679fc1a1707ed17fdff437 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:20:15 +0000 Subject: [PATCH 086/192] libretro.beetle-supergrafx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/beetle-supergrafx.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index d4c83678d224..df4098717e9f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -107,15 +107,7 @@ lib.makeScope newScope (self: rec { beetle-supafaust = self.callPackage ./cores/beetle-supafaust.nix { }; - beetle-supergrafx = mkLibretroCore { - core = "mednafen-supergrafx"; - repo = "beetle-supergrafx"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's SuperGrafx core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-supergrafx = self.callPackage ./cores/beetle-supergrafx.nix { }; beetle-vb = mkLibretroCore { core = "mednafen-vb"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix new file mode 100644 index 000000000000..8737d5a824b2 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-supergrafx"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-supergrafx-libretro"; + rev = "a776133c34ae8da5daf7d9ccb43e3e292e2b07b0"; + hash = "sha256-FemWW4EPQCwhrS7YEytf6fEeimdTTfzaDdyRNDIBQyk="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's SuperGrafx core to libretro"; + homepage = "https://github.com/libretro/beetle-supergrafx-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 8a29897d5f88279461eaf45f9ae38451c9a6d3c1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:23:03 +0000 Subject: [PATCH 087/192] libretro.beetle-vb: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-vb.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-vb.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index df4098717e9f..a6e4edd22ddd 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -109,15 +109,7 @@ lib.makeScope newScope (self: rec { beetle-supergrafx = self.callPackage ./cores/beetle-supergrafx.nix { }; - beetle-vb = mkLibretroCore { - core = "mednafen-vb"; - repo = "beetle-vb"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's VirtualBoy core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-vb = self.callPackage ./cores/beetle-vb.nix { }; beetle-wswan = mkLibretroCore { core = "mednafen-wswan"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix b/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix new file mode 100644 index 000000000000..1262b40854c7 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-vb"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-vb-libretro"; + rev = "8f837ebc077afdd6652efb2827fd8308a07113ca"; + hash = "sha256-eAnBubNhj78G4r8OHVqwFXGOSA9wEYI6ZwNyiwDW8W8="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's VirtualBoy core to libretro"; + homepage = "https://github.com/libretro/beetle-vb-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 4b51fe0a49668d8753f8c998a1644fe0fab17503 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:25:20 +0000 Subject: [PATCH 088/192] libretro.beetle-wswan: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/beetle-wswan.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index a6e4edd22ddd..6a6c6abc8ae1 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -111,15 +111,7 @@ lib.makeScope newScope (self: rec { beetle-vb = self.callPackage ./cores/beetle-vb.nix { }; - beetle-wswan = mkLibretroCore { - core = "mednafen-wswan"; - repo = "beetle-wswan"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's WonderSwan core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-wswan = self.callPackage ./cores/beetle-wswan.nix { }; blastem = mkLibretroCore { core = "blastem"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix b/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix new file mode 100644 index 000000000000..14a856a54220 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-wswan"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-wswan-libretro"; + rev = "440e9228592a3f603d7d09e8bee707b0163f545f"; + hash = "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's WonderSwan core to libretro"; + homepage = "https://github.com/libretro/beetle-wswan-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 573e6d71af33a6e84813dd338030491b9c9b8f30 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:28:13 +0000 Subject: [PATCH 089/192] libretro.blastem: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------- .../emulators/retroarch/cores/blastem.nix | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/blastem.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 6a6c6abc8ae1..ed2066a7ba62 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -113,14 +113,7 @@ lib.makeScope newScope (self: rec { beetle-wswan = self.callPackage ./cores/beetle-wswan.nix { }; - blastem = mkLibretroCore { - core = "blastem"; - meta = { - description = "Port of BlastEm to libretro"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.x86; - }; - }; + blastem = self.callPackage ./cores/blastem.nix { }; bluemsx = mkLibretroCore { core = "bluemsx"; diff --git a/pkgs/applications/emulators/retroarch/cores/blastem.nix b/pkgs/applications/emulators/retroarch/cores/blastem.nix new file mode 100644 index 000000000000..395d568540ac --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/blastem.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "blastem"; + version = "unstable-2022-07-26"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "blastem"; + rev = "277e4a62668597d4f59cadda1cbafb844f981d45"; + hash = "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs="; + }; + + meta = { + description = "Port of BlastEm to libretro"; + homepage = "https://github.com/libretro/blastem"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.x86; + }; +} From ee8af6d04a6f635424f88da317c025444e23bb97 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:33:20 +0000 Subject: [PATCH 090/192] libretro.bluemsx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/bluemsx.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/bluemsx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ed2066a7ba62..948c0b35fff8 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -115,13 +115,7 @@ lib.makeScope newScope (self: rec { blastem = self.callPackage ./cores/blastem.nix { }; - bluemsx = mkLibretroCore { - core = "bluemsx"; - meta = { - description = "Port of BlueMSX to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + bluemsx = self.callPackage ./cores/bluemsx.nix { }; bsnes = mkLibretroCore { core = "bsnes"; diff --git a/pkgs/applications/emulators/retroarch/cores/bluemsx.nix b/pkgs/applications/emulators/retroarch/cores/bluemsx.nix new file mode 100644 index 000000000000..f3be7a2d1ca5 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/bluemsx.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "bluemsx"; + version = "unstable-2024-10-22"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "bluemsx-libretro"; + rev = "01ce142ccb85c302420cb962d1b6e6a68a6ce076"; + hash = "sha256-h3Zpv+h6CbM1pdSOXsjN0pFUjXLn5T/R5W55VZXpMVM="; + }; + + meta = { + description = "Port of BlueMSX to libretro"; + homepage = "https://github.com/libretro/blueMSX-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 5d6b381320874afbafed4f2cae30d8841f5c6a2c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:35:24 +0000 Subject: [PATCH 091/192] libretro.bsnes: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/bsnes.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/bsnes.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 948c0b35fff8..6e94d6cb04e0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -117,14 +117,7 @@ lib.makeScope newScope (self: rec { bluemsx = self.callPackage ./cores/bluemsx.nix { }; - bsnes = mkLibretroCore { - core = "bsnes"; - makefile = "Makefile"; - meta = { - description = "Port of bsnes to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes = self.callPackage ./cores/bsnes.nix { }; bsnes-hd = mkLibretroCore { core = "bsnes-hd-beta"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes.nix b/pkgs/applications/emulators/retroarch/cores/bsnes.nix new file mode 100644 index 000000000000..533aaa0763f9 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/bsnes.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "bsnes"; + version = "unstable-2024-09-06"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "bsnes-libretro"; + rev = "20c55eb6333a11395ba637df8583066483e58cb2"; + hash = "sha256-IP00xtxS3wwnQSmYltrX8GEHZX/65xnx2EsmQlE1VZM="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of bsnes to libretro"; + homepage = "https://github.com/libretro/bsnes-libretro"; + license = lib.licenses.gpl3Only; + }; +} From aac2ac2dbc0b47a42ff5391f9ca5f7b9a6615fdb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:42:27 +0000 Subject: [PATCH 092/192] libretro.bsnes-hd: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 24 +----------- .../emulators/retroarch/cores/bsnes-hd.nix | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 6e94d6cb04e0..da3df1e4b4dd 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -119,29 +119,7 @@ lib.makeScope newScope (self: rec { bsnes = self.callPackage ./cores/bsnes.nix { }; - bsnes-hd = mkLibretroCore { - core = "bsnes-hd-beta"; - repo = "bsnes-hd"; - makefile = "GNUmakefile"; - makeFlags = - let - # linux = bsd - # https://github.com/DerKoun/bsnes-hd/blob/f0b6cf34e9780d53516977ed2de64137a8bcc3c5/bsnes/GNUmakefile#L37 - platform = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; - in - [ - "-C" - "bsnes" - "target=libretro" - "platform=${platform}" - ]; - extraBuildInputs = [ xorg.libX11 xorg.libXext ]; - postBuild = "cd bsnes/out"; - meta = { - description = "Port of bsnes-hd to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes-hd = self.callPackage ./cores/bsnes-hd.nix { }; bsnes-mercury = mkLibretroCore { core = "bsnes-mercury-accuracy"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix b/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix new file mode 100644 index 000000000000..33cef08d93bf --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + xorg, +}: +mkLibretroCore { + core = "bsnes-hd-beta"; + version = "unstable-2023-04-26"; + + src = fetchFromGitHub { + owner = "DerKoun"; + repo = "bsnes-hd"; + rev = "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8"; + hash = "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI="; + }; + + extraBuildInputs = [ + xorg.libX11 + xorg.libXext + ]; + + makefile = "GNUmakefile"; + makeFlags = [ + "-C" + "bsnes" + "target=libretro" + "platform=linux" + ]; + + postBuild = "cd bsnes/out"; + + meta = { + description = "Port of bsnes-hd to libretro"; + homepage = "https://github.com/DerKoun/bsnes-hd"; + license = lib.licenses.gpl3Only; + }; +} From 813002b411344a99fea41b37512e90966830c331 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:49:33 +0000 Subject: [PATCH 093/192] libretro.bsnes-mercury{,-balanced,-performance}: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 33 ++----------------- .../retroarch/cores/bsnes-mercury.nix | 26 +++++++++++++++ 2 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index da3df1e4b4dd..e4f4232cfcb6 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -121,38 +121,11 @@ lib.makeScope newScope (self: rec { bsnes-hd = self.callPackage ./cores/bsnes-hd.nix { }; - bsnes-mercury = mkLibretroCore { - core = "bsnes-mercury-accuracy"; - repo = "bsnes-mercury"; - makefile = "Makefile"; - makeFlags = [ "PROFILE=accuracy" ]; - meta = { - description = "Fork of bsnes with HLE DSP emulation restored (accuracy profile)"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes-mercury = self.callPackage ./cores/bsnes-mercury.nix { }; - bsnes-mercury-balanced = mkLibretroCore { - core = "bsnes-mercury-balanced"; - repo = "bsnes-mercury"; - makefile = "Makefile"; - makeFlags = [ "PROFILE=balanced" ]; - meta = { - description = "Fork of bsnes with HLE DSP emulation restored (balanced profile)"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes-mercury-balanced = self.bsnes-mercury.override { withProfile = "balanced"; }; - bsnes-mercury-performance = mkLibretroCore { - core = "bsnes-mercury-performance"; - repo = "bsnes-mercury"; - makefile = "Makefile"; - makeFlags = [ "PROFILE=performance" ]; - meta = { - description = "Fork of bsnes with HLE DSP emulation restored (performance profile)"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes-mercury-performance = self.bsnes-mercury.override { withProfile = "performance"; }; citra = mkLibretroCore rec { core = "citra"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix b/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix new file mode 100644 index 000000000000..f86a355a7c69 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + withProfile ? "accuracy", +}: +mkLibretroCore { + core = "bsnes-mercury-${withProfile}"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "bsnes-mercury"; + rev = "0f35d044bf2f2b879018a0500e676447e93a1db1"; + hash = "sha256-skVREKYITZn+gKKSZmwuBCWrG0jb/pifwIgat8VyQ8U="; + }; + + makefile = "Makefile"; + makeFlags = [ "PROFILE=${withProfile}" ]; + + meta = { + description = "Fork of bsnes with HLE DSP emulation restored (${withProfile} profile)"; + homepage = "https://github.com/libretro/bsnes-mercury"; + license = lib.licenses.gpl3Only; + }; +} From 3f0e78e5b8912fc8f2596f0646b073ec465ea6ee Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:15:24 +0000 Subject: [PATCH 094/192] libretro.citra: unstable-2024-01-24 -> unstable-2024-04-01, move to retroarch/cores --- .../emulators/retroarch/cores.nix | 21 +------- .../emulators/retroarch/cores/citra.nix | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/citra.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e4f4232cfcb6..3ea8b478a469 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -127,26 +127,7 @@ lib.makeScope newScope (self: rec { bsnes-mercury-performance = self.bsnes-mercury.override { withProfile = "performance"; }; - citra = mkLibretroCore rec { - core = "citra"; - extraBuildInputs = [ libGLU libGL boost ffmpeg_6 nasm ]; - makefile = "Makefile"; - makeFlags = [ - "HAVE_FFMPEG_STATIC=0" - # https://github.com/libretro/citra/blob/1a66174355b5ed948de48ef13c0ed508b6d6169f/Makefile#L87-L90 - "GIT_REV=${(getCoreSrc core).rev}" - "GIT_DESC=${lib.substring 0 8 (getCoreSrc core).rev}" - "GIT_BRANCH=master" - "BUILD_DATE=01/01/1970_00:00" - ]; - # FIXME: build fail with GCC13: - # error: 'mic_device_name' has incomplete type - stdenv = gcc12Stdenv; - meta = { - description = "Port of Citra to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + citra = self.callPackage ./cores/citra.nix { }; desmume = mkLibretroCore { core = "desmume"; diff --git a/pkgs/applications/emulators/retroarch/cores/citra.nix b/pkgs/applications/emulators/retroarch/cores/citra.nix new file mode 100644 index 000000000000..1a826fed9eaa --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/citra.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + boost, + ffmpeg_6, + gcc12Stdenv, + libGL, + libGLU, + mkLibretroCore, + nasm, +}: +mkLibretroCore rec { + core = "citra"; + version = "unstable-2024-04-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "citra"; + # TODO: upstream migrated to cmake, this is the latest rev without it + rev = "36b600692905ebd457cbc9321e2f521938eced16"; + hash = "sha256-ZJcsdFgLBda4xS4Z6I8Pu+6B9TYwak//0CbloDK3Yg0="; + fetchSubmodules = true; + }; + + makefile = "Makefile"; + makeFlags = [ + "HAVE_FFMPEG_STATIC=0" + # https://github.com/libretro/citra/blob/1a66174355b5ed948de48ef13c0ed508b6d6169f/Makefile#L87-L90 + "GIT_REV=${src.rev}" + "GIT_DESC=${lib.substring 0 7 src.rev}" + "GIT_BRANCH=master" + "BUILD_DATE=01/01/1970_00:00" + ]; + + extraBuildInputs = [ + boost + ffmpeg_6 + libGL + libGLU + nasm + ]; + + # FIXME: build fail with GCC13: + # error: 'mic_device_name' has incomplete type + stdenv = gcc12Stdenv; + + meta = { + description = "Port of Citra to libretro"; + homepage = "https://github.com/libretro/citra"; + license = lib.licenses.gpl2Plus; + }; +} From 2c54c27cbe77ef454b7d26c85f25a8d0cf3cc517 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:22:08 +0000 Subject: [PATCH 095/192] libretro.desmume: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +----- .../emulators/retroarch/cores/desmume.nix | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/desmume.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 3ea8b478a469..3a1603af73a4 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -129,17 +129,7 @@ lib.makeScope newScope (self: rec { citra = self.callPackage ./cores/citra.nix { }; - desmume = mkLibretroCore { - core = "desmume"; - preBuild = "cd desmume/src/frontend/libretro"; - extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; - makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; - meta = { - description = "Port of DeSmuME to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + desmume = self.callPackage ./cores/desmume.nix { }; desmume2015 = mkLibretroCore { core = "desmume2015"; diff --git a/pkgs/applications/emulators/retroarch/cores/desmume.nix b/pkgs/applications/emulators/retroarch/cores/desmume.nix new file mode 100644 index 000000000000..5236a4bddc1f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/desmume.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, + libpcap, + libGLU, + libGL, + xorg, +}: +mkLibretroCore { + core = "desmume"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "desmume"; + rev = "7f05a8d447b00acd9e0798aee97b4f72eb505ef9"; + hash = "sha256-BttWMunVbfPOTGx+DV+3QyOwW+55tgXKVIn99DZhbBI="; + }; + + extraBuildInputs = [ + libpcap + libGLU + libGL + xorg.libX11 + ]; + + makeFlags = + lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + + preBuild = "cd desmume/src/frontend/libretro"; + + meta = { + description = "Port of DeSmuME to libretro"; + homepage = "https://github.com/libretro/desmume"; + license = lib.licenses.gpl2Plus; + }; +} From a9249a3beac10bb566b6c9ea56d8ff8ec146b92d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:25:39 +0000 Subject: [PATCH 096/192] libretro.desmume2015: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +----- .../emulators/retroarch/cores/desmume2015.nix | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/desmume2015.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 3a1603af73a4..5e48a73e9ca1 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -131,17 +131,7 @@ lib.makeScope newScope (self: rec { desmume = self.callPackage ./cores/desmume.nix { }; - desmume2015 = mkLibretroCore { - core = "desmume2015"; - extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; - makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; - preBuild = "cd desmume"; - meta = { - description = "Port of DeSmuME ~2015 to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + desmume2015 = self.callPackage ./cores/desmume2015.nix { }; dolphin = mkLibretroCore { core = "dolphin"; diff --git a/pkgs/applications/emulators/retroarch/cores/desmume2015.nix b/pkgs/applications/emulators/retroarch/cores/desmume2015.nix new file mode 100644 index 000000000000..af9f8870d846 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/desmume2015.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, + libpcap, + libGLU, + libGL, + xorg, +}: +mkLibretroCore { + core = "desmume2015"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "desmume2015"; + rev = "af397ff3d1f208c27f3922cc8f2b8e08884ba893"; + hash = "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U="; + }; + + extraBuildInputs = [ + libpcap + libGLU + libGL + xorg.libX11 + ]; + + makeFlags = + lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + + preBuild = "cd desmume"; + + meta = { + description = "Port of DeSmuME ~2015 to libretro"; + homepage = "https://github.com/libretro/desmume2015"; + license = lib.licenses.gpl2Plus; + }; +} From 41a7b6c5a85df48d9950a5941955cc5d7a585414 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:32:06 +0000 Subject: [PATCH 097/192] libretro.dolphin: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 29 +------- .../emulators/retroarch/cores/dolphin.nix | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/dolphin.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5e48a73e9ca1..beb5c8393f68 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -133,34 +133,7 @@ lib.makeScope newScope (self: rec { desmume2015 = self.callPackage ./cores/desmume2015.nix { }; - dolphin = mkLibretroCore { - core = "dolphin"; - extraNativeBuildInputs = [ cmake curl pkg-config ]; - extraBuildInputs = [ - libGLU - libGL - pcre - sfml - gettext - hidapi - libevdev - udev - ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); - makefile = "Makefile"; - cmakeFlags = [ - "-DLIBRETRO=ON" - "-DLIBRETRO_STATIC=1" - "-DENABLE_QT=OFF" - "-DENABLE_LTO=OFF" - "-DUSE_UPNP=OFF" - "-DUSE_DISCORD_PRESENCE=OFF" - ]; - dontUseCmakeBuildDir = true; - meta = { - description = "Port of Dolphin to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + dolphin = self.callPackage ./cores/dolphin.nix { }; dosbox = mkLibretroCore { core = "dosbox"; diff --git a/pkgs/applications/emulators/retroarch/cores/dolphin.nix b/pkgs/applications/emulators/retroarch/cores/dolphin.nix new file mode 100644 index 000000000000..f73ecff6c673 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/dolphin.nix @@ -0,0 +1,71 @@ +{ + lib, + fetchFromGitHub, + cmake, + curl, + gettext, + hidapi, + libGL, + libGLU, + libevdev, + mkLibretroCore, + pcre, + pkg-config, + sfml, + udev, + xorg, +}: +mkLibretroCore { + core = "dolphin"; + version = "unstable-2024-04-19"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "dolphin"; + rev = "89a4df725d4eb24537728f7d655cddb1add25c18"; + hash = "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs="; + }; + + extraNativeBuildInputs = [ + cmake + curl + pkg-config + ]; + extraBuildInputs = [ + gettext + hidapi + libGL + libGLU + libevdev + pcre + sfml + udev + xorg.libSM + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXinerama + xorg.libXrandr + xorg.libXxf86vm + xorg.libpthreadstubs + xorg.libxcb + xorg.xcbutil + ]; + + makefile = "Makefile"; + cmakeFlags = [ + "-DLIBRETRO=ON" + "-DLIBRETRO_STATIC=1" + "-DENABLE_QT=OFF" + "-DENABLE_LTO=OFF" + "-DUSE_UPNP=OFF" + "-DUSE_DISCORD_PRESENCE=OFF" + ]; + dontUseCmakeBuildDir = true; + + meta = { + description = "Port of Dolphin to libretro"; + homepage = "https://github.com/libretro/dolphin"; + license = lib.licenses.gpl2Plus; + }; +} From 61c780f7b83cf978d3ed6a6348ac3f911cf8d489 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:43:02 +0000 Subject: [PATCH 098/192] libretro.dosbox: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/dosbox.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/dosbox.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index beb5c8393f68..5910a24dabe3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -135,14 +135,7 @@ lib.makeScope newScope (self: rec { dolphin = self.callPackage ./cores/dolphin.nix { }; - dosbox = mkLibretroCore { - core = "dosbox"; - CXXFLAGS = "-std=gnu++11"; - meta = { - description = "Port of DOSBox to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + dosbox = self.callPackage ./cores/dosbox.nix { }; dosbox-pure = mkLibretroCore { core = "dosbox-pure"; diff --git a/pkgs/applications/emulators/retroarch/cores/dosbox.nix b/pkgs/applications/emulators/retroarch/cores/dosbox.nix new file mode 100644 index 000000000000..50eb9ab55e9f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/dosbox.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "dosbox"; + version = "unstable-2022-07-18"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "dosbox-libretro"; + rev = "b7b24262c282c0caef2368c87323ff8c381b3102"; + hash = "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I="; + }; + + env.CXXFLAGS = "-std=gnu++11"; + + meta = { + description = "Port of DOSBox to libretro"; + homepage = "https://github.com/libretro/dosbox-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 12a9521009bcd0d430ff0975b7307c6d4d8b5962 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:46:29 +0000 Subject: [PATCH 099/192] libretro.dosbox-pure: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/dosbox-pure.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5910a24dabe3..627f8e0c1f45 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -137,16 +137,7 @@ lib.makeScope newScope (self: rec { dosbox = self.callPackage ./cores/dosbox.nix { }; - dosbox-pure = mkLibretroCore { - core = "dosbox-pure"; - CXXFLAGS = "-std=gnu++11"; - hardeningDisable = [ "format" ]; - makefile = "Makefile"; - meta = { - description = "Port of DOSBox to libretro aiming for simplicity and ease of use"; - license = lib.licenses.gpl2Only; - }; - }; + dosbox-pure = self.callPackage ./cores/dosbox-pure.nix { }; easyrpg = mkLibretroCore { core = "easyrpg"; diff --git a/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix b/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix new file mode 100644 index 000000000000..152ad2e280af --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "dosbox-pure"; + version = "unstable-2024-09-28"; + + src = fetchFromGitHub { + owner = "schellingb"; + repo = "dosbox-pure"; + rev = "9b4147fd14332a7354c9b76fa72653bda2d919e9"; + hash = "sha256-lzRBzBMIQ3X+VAHK8pl/HYELecTkdFlWJI7C1csmZ7I="; + }; + + hardeningDisable = [ "format" ]; + makefile = "Makefile"; + + meta = { + description = "Port of DOSBox to libretro aiming for simplicity and ease of use"; + homepage = "https://github.com/schellingb/dosbox-pure"; + license = lib.licenses.gpl2Only; + }; +} From 980add9eb94d5e51796e7868f4f5c91d0d9f9946 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:56:18 +0000 Subject: [PATCH 100/192] libretro.easyrpg: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 26 +------ .../emulators/retroarch/cores/easyrpg.nix | 75 +++++++++++++++++++ 2 files changed, 76 insertions(+), 25 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/easyrpg.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 627f8e0c1f45..e8f6369c6d4f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -139,31 +139,7 @@ lib.makeScope newScope (self: rec { dosbox-pure = self.callPackage ./cores/dosbox-pure.nix { }; - easyrpg = mkLibretroCore { - core = "easyrpg"; - extraNativeBuildInputs = [ cmake pkg-config ]; - extraBuildInputs = [ fmt freetype harfbuzz liblcf libpng libsndfile libvorbis libxmp mpg123 opusfile pcre pixman speexdsp ]; - patches = [ - # The following patch is shared with easyrpg-player. - # Update when new versions of liblcf and easyrpg-player are released. - # See pkgs/games/easyrpg-player/default.nix for details. - (fetchpatch { - name = "0001-Fix-building-with-fmtlib-10.patch"; - url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch"; - hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54="; - }) - ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DPLAYER_TARGET_PLATFORM=libretro" - "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" - ]; - makefile = "Makefile"; - meta = { - description = "EasyRPG Player libretro port"; - license = lib.licenses.gpl3Only; - }; - }; + easyrpg = self.callPackage ./cores/easyrpg.nix { }; eightyone = mkLibretroCore { core = "81"; diff --git a/pkgs/applications/emulators/retroarch/cores/easyrpg.nix b/pkgs/applications/emulators/retroarch/cores/easyrpg.nix new file mode 100644 index 000000000000..d28a571ba576 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/easyrpg.nix @@ -0,0 +1,75 @@ +{ + lib, + fetchFromGitHub, + cmake, + fetchpatch, + fmt, + freetype, + harfbuzz, + liblcf, + libpng, + libsndfile, + libvorbis, + libxmp, + mkLibretroCore, + mpg123, + opusfile, + pcre, + pixman, + pkg-config, + speexdsp, +}: +mkLibretroCore { + core = "easyrpg"; + version = "0.8-unstable-2023-04-29"; + + src = fetchFromGitHub { + owner = "EasyRPG"; + repo = "Player"; + rev = "f8e41f43b619413f95847536412b56f85307d378"; + hash = "sha256-nvWM4czTv/GxY9raomBEn7dmKBeLtSA9nvjMJxc3Q8s="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ + cmake + pkg-config + ]; + extraBuildInputs = [ + fmt + freetype + harfbuzz + liblcf + libpng + libsndfile + libvorbis + libxmp + mpg123 + opusfile + pcre + pixman + speexdsp + ]; + patches = [ + # The following patch is shared with easyrpg-player. + # Update when new versions of liblcf and easyrpg-player are released. + # See easyrpg-player expression for details. + (fetchpatch { + name = "0001-Fix-building-with-fmtlib-10.patch"; + url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch"; + hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54="; + }) + ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DPLAYER_TARGET_PLATFORM=libretro" + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" + ]; + makefile = "Makefile"; + + meta = { + description = "EasyRPG Player libretro port"; + homepage = "https://github.com/EasyRPG/Player"; + license = lib.licenses.gpl3Only; + }; +} From 880d3c5665271511d1790240097f6151d14b0c5a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 14:52:31 +0000 Subject: [PATCH 101/192] libretro.eightyone: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------- .../emulators/retroarch/cores/eightyone.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/eightyone.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e8f6369c6d4f..d76a570bbbaa 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -141,14 +141,7 @@ lib.makeScope newScope (self: rec { easyrpg = self.callPackage ./cores/easyrpg.nix { }; - eightyone = mkLibretroCore { - core = "81"; - repo = "eightyone"; - meta = { - description = "Port of EightyOne to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + eightyone = self.callPackage ./cores/eightyone.nix { }; fbalpha2012 = mkLibretroCore { core = "fbalpha2012"; diff --git a/pkgs/applications/emulators/retroarch/cores/eightyone.nix b/pkgs/applications/emulators/retroarch/cores/eightyone.nix new file mode 100644 index 000000000000..e17e03605ec7 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/eightyone.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "81"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "81-libretro"; + rev = "ffc99f27f092addc9ddd34dd0e3a3d4d1c053cbf"; + hash = "sha256-3AIXk3LJHZHWIojMeo2BJHWYDHQ17WVbkwjFhXM14ZE="; + }; + + meta = { + description = "Port of EightyOne to libretro"; + homepage = "https://github.com/libretro/81-libretro"; + license = lib.licenses.gpl3Only; + }; +} From c0433e2a9caece50821c41f428369de4556485f9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 14:57:04 +0000 Subject: [PATCH 102/192] libretro.fbalpha2012: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/fbalpha2012.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index d76a570bbbaa..749058fef9d9 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -143,16 +143,7 @@ lib.makeScope newScope (self: rec { eightyone = self.callPackage ./cores/eightyone.nix { }; - fbalpha2012 = mkLibretroCore { - core = "fbalpha2012"; - makefile = "makefile.libretro"; - preBuild = "cd svn-current/trunk"; - meta = { - description = "Port of Final Burn Alpha ~2012 to libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + fbalpha2012 = self.callPackage ./cores/fbalpha2012.nix { }; fbneo = mkLibretroCore { core = "fbneo"; diff --git a/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix b/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix new file mode 100644 index 000000000000..17d8e1fe2e07 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fbalpha2012"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "fbalpha2012"; + rev = "77167cea72e808384c136c8c163a6b4975ce7a84"; + hash = "sha256-giEV09dT/e82bmDlRkxpkW04JcsEZc/enIPecqYtg3c="; + }; + + makefile = "makefile.libretro"; + preBuild = "cd svn-current/trunk"; + + meta = { + description = "Port of Final Burn Alpha ~2012 to libretro"; + homepage = "https://github.com/libretro/fbalpha2012"; + license = lib.licenses.unfreeRedistributable; + }; +} From b3de16f47c4fa527ec0f033c8102778360d1280d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 15:00:11 +0000 Subject: [PATCH 103/192] libretro.fbneo: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/fbneo.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fbneo.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 749058fef9d9..6354edf11a29 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -145,16 +145,7 @@ lib.makeScope newScope (self: rec { fbalpha2012 = self.callPackage ./cores/fbalpha2012.nix { }; - fbneo = mkLibretroCore { - core = "fbneo"; - makefile = "Makefile"; - preBuild = "cd src/burner/libretro"; - meta = { - description = "Port of FBNeo to libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + fbneo = self.callPackage ./cores/fbneo.nix { }; fceumm = mkLibretroCore { core = "fceumm"; diff --git a/pkgs/applications/emulators/retroarch/cores/fbneo.nix b/pkgs/applications/emulators/retroarch/cores/fbneo.nix new file mode 100644 index 000000000000..486d44da6fb3 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fbneo.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fbneo"; + version = "unstable-2024-10-03"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "fbneo"; + rev = "d72f49f4a45dbfc5a855956d1a75ce2d0601c1c5"; + hash = "sha256-+T+HQo6IfY8+oE/mOg54Vn9NhasGYNCLXksFdSDT/xE="; + }; + + makefile = "Makefile"; + preBuild = "cd src/burner/libretro"; + + meta = { + description = "Port of FBNeo to libretro"; + homepage = "https://github.com/libretro/fbneo"; + license = lib.licenses.unfreeRedistributable; + }; +} From 1e7e62c52a453ff1a4f6cb9e82ef7db76ec19de0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 15:56:41 +0000 Subject: [PATCH 104/192] libretro.fceumm: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/fceumm.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fceumm.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 6354edf11a29..0e25640d9dd2 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -147,13 +147,7 @@ lib.makeScope newScope (self: rec { fbneo = self.callPackage ./cores/fbneo.nix { }; - fceumm = mkLibretroCore { - core = "fceumm"; - meta = { - description = "FCEUmm libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + fceumm = self.callPackage ./cores/fceumm.nix { }; flycast = mkLibretroCore { core = "flycast"; diff --git a/pkgs/applications/emulators/retroarch/cores/fceumm.nix b/pkgs/applications/emulators/retroarch/cores/fceumm.nix new file mode 100644 index 000000000000..e8ada8587cbf --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fceumm.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fceumm"; + version = "unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-fceumm"; + rev = "e226068f979cd8fbfc3be9780d16cfb1405095b0"; + hash = "sha256-2G5EzcDJkEhaN+nXi/wu3+Ejim04ZzOr+LW69cLAEuM="; + }; + + meta = { + description = "FCEUmm libretro port"; + homepage = "https://github.com/libretro/libretro-fceumm"; + license = lib.licenses.gpl2Only; + }; +} From f66bd675c48a8f178cc7c6b766281f31a704c0c3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:01:18 +0000 Subject: [PATCH 105/192] libretro.flycast: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 13 +------ .../emulators/retroarch/cores/flycast.nix | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/flycast.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 0e25640d9dd2..1dfb91867049 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -149,18 +149,7 @@ lib.makeScope newScope (self: rec { fceumm = self.callPackage ./cores/fceumm.nix { }; - flycast = mkLibretroCore { - core = "flycast"; - extraNativeBuildInputs = [ cmake ]; - extraBuildInputs = [ libGL libGLU ]; - cmakeFlags = [ "-DLIBRETRO=ON" ]; - makefile = "Makefile"; - meta = { - description = "Flycast libretro port"; - license = lib.licenses.gpl2Only; - platforms = [ "aarch64-linux" "x86_64-linux" ]; - }; - }; + flycast = self.callPackage ./cores/flycast.nix { }; fmsx = mkLibretroCore { core = "fmsx"; diff --git a/pkgs/applications/emulators/retroarch/cores/flycast.nix b/pkgs/applications/emulators/retroarch/cores/flycast.nix new file mode 100644 index 000000000000..43982c818d2d --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/flycast.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + cmake, + libGL, + libGLU, +}: +mkLibretroCore { + core = "flycast"; + version = "unstable-2024-10-05"; + + src = fetchFromGitHub { + owner = "flyinghead"; + repo = "flycast"; + rev = "d689c50e21bf956913ac607933cd4082eaedc06b"; + hash = "sha256-XIe1JrKVY4ba5WnKrVofWNpJU5pcwUyDd14ZzaGcf+k="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ cmake ]; + extraBuildInputs = [ + libGL + libGLU + ]; + cmakeFlags = [ "-DLIBRETRO=ON" ]; + makefile = "Makefile"; + + meta = { + description = "Flycast libretro port"; + homepage = "https://github.com/flyinghead/flycast"; + license = lib.licenses.gpl2Only; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} From 4724ea1666cd8e444d5c0e797feeba5eb2bbc29f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:09:48 +0000 Subject: [PATCH 106/192] libretro.fmsx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/fmsx.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fmsx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 1dfb91867049..7e597889c956 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -151,15 +151,7 @@ lib.makeScope newScope (self: rec { flycast = self.callPackage ./cores/flycast.nix { }; - fmsx = mkLibretroCore { - core = "fmsx"; - makefile = "Makefile"; - meta = { - description = "FMSX libretro port"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + fmsx = self.callPackage ./cores/fmsx.nix { }; freeintv = mkLibretroCore { core = "freeintv"; diff --git a/pkgs/applications/emulators/retroarch/cores/fmsx.nix b/pkgs/applications/emulators/retroarch/cores/fmsx.nix new file mode 100644 index 000000000000..e888ef1e0693 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fmsx.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fmsx"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "fmsx-libretro"; + rev = "cf97a3c6da07d5f8e98c90c907ad987ffea432e0"; + hash = "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA="; + }; + + makefile = "Makefile"; + + meta = { + description = "FMSX libretro port"; + homepage = "https://github.com/libretro/fmsx-libretro"; + license = lib.licenses.unfreeRedistributable; + }; +} From 225b5a48769bf6fa8d2c82f1eea07a39e844a77b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:13:41 +0000 Subject: [PATCH 107/192] libretro.freeintv: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/freeintv.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/freeintv.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 7e597889c956..845570c7c1c5 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -153,14 +153,7 @@ lib.makeScope newScope (self: rec { fmsx = self.callPackage ./cores/fmsx.nix { }; - freeintv = mkLibretroCore { - core = "freeintv"; - makefile = "Makefile"; - meta = { - description = "FreeIntv libretro port"; - license = lib.licenses.gpl3Only; - }; - }; + freeintv = self.callPackage ./cores/freeintv.nix { }; fuse = mkLibretroCore { core = "fuse"; diff --git a/pkgs/applications/emulators/retroarch/cores/freeintv.nix b/pkgs/applications/emulators/retroarch/cores/freeintv.nix new file mode 100644 index 000000000000..a99be9271590 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/freeintv.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "freeintv"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "freeintv"; + rev = "6bd91d0d83d896e66b9fd7e5e239f93f00e4ad87"; + hash = "sha256-P3devj/aAa0e/QpV68kQkLAvhrVGO8O8ijkUAobgUb0="; + }; + + makefile = "Makefile"; + + meta = { + description = "FreeIntv libretro port"; + homepage = "https://github.com/libretro/freeintv"; + license = lib.licenses.gpl3Only; + }; +} From 893a1384e45d0d57ef1e2e353b0d47ec9b7adca5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:16:44 +0000 Subject: [PATCH 108/192] libretro.fuse: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/fuse.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fuse.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 845570c7c1c5..e73fc71d05c8 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -155,13 +155,7 @@ lib.makeScope newScope (self: rec { freeintv = self.callPackage ./cores/freeintv.nix { }; - fuse = mkLibretroCore { - core = "fuse"; - meta = { - description = "Port of the Fuse Unix Spectrum Emulator to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + fuse = self.callPackage ./cores/fuse.nix { }; gambatte = mkLibretroCore { core = "gambatte"; diff --git a/pkgs/applications/emulators/retroarch/cores/fuse.nix b/pkgs/applications/emulators/retroarch/cores/fuse.nix new file mode 100644 index 000000000000..1bfd08e81fb0 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fuse.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fuse"; + version = "unstable-2024-09-20"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "fuse-libretro"; + rev = "6fd07d90acc38a1b8835bf16539b833f21aaa38f"; + hash = "sha256-q5vcFNr1RBeTaw1R2LDY9xLU1oGeWtPemTdliWR+39s="; + }; + + meta = { + description = "Port of the Fuse Unix Spectrum Emulator to libretro"; + homepage = "https://github.com/libretro/fuse-libretro"; + license = lib.licenses.gpl3Only; + }; +} From 7d2f1f1ce1f42cd2ddc0728854d6887cb9b5176c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:19:04 +0000 Subject: [PATCH 109/192] libretro.gambatte: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/gambatte.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/gambatte.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e73fc71d05c8..11ac6c5573d1 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -157,13 +157,7 @@ lib.makeScope newScope (self: rec { fuse = self.callPackage ./cores/fuse.nix { }; - gambatte = mkLibretroCore { - core = "gambatte"; - meta = { - description = "Gambatte libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + gambatte = self.callPackage ./cores/gambatte.nix { }; genesis-plus-gx = mkLibretroCore { core = "genesis-plus-gx"; diff --git a/pkgs/applications/emulators/retroarch/cores/gambatte.nix b/pkgs/applications/emulators/retroarch/cores/gambatte.nix new file mode 100644 index 000000000000..d256b0d5ffaa --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/gambatte.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "gambatte"; + version = "unstable-2024-10-04"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "gambatte-libretro"; + rev = "3eeb65e9bcf4b2a7ca24c5cebdfa7e342177ef0f"; + hash = "sha256-tNGMR6GIyXen9+Ktg3IvYTcPidc+5Z8TpBQu1YgmqlY="; + }; + + meta = { + description = "Gambatte libretro port"; + homepage = "https://github.com/libretro/gambatte-libretro"; + license = lib.licenses.gpl2Only; + }; +} From c887658db423538949d5e867b3eb9cad7ea38cbb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:21:48 +0000 Subject: [PATCH 110/192] libretro.genesis-plus-gx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------- .../retroarch/cores/genesis-plus-gx.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 11ac6c5573d1..ebcae71a522f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -159,14 +159,7 @@ lib.makeScope newScope (self: rec { gambatte = self.callPackage ./cores/gambatte.nix { }; - genesis-plus-gx = mkLibretroCore { - core = "genesis-plus-gx"; - meta = { - description = "Enhanced Genesis Plus libretro port"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + genesis-plus-gx = self.callPackage ./cores/genesis-plus-gx.nix { }; gpsp = mkLibretroCore { core = "gpsp"; diff --git a/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix new file mode 100644 index 000000000000..7754df92f19a --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "genesis-plus-gx"; + version = "unstable-2024-09-18"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "Genesis-Plus-GX"; + rev = "7de0f0b6cde9bda1235b448aa607044b3f80ab3c"; + hash = "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM="; + }; + + meta = { + description = "Enhanced Genesis Plus libretro port"; + homepage = "https://github.com/libretro/Genesis-Plus-GX"; + license = lib.licenses.unfreeRedistributable; + }; +} From d5623dc94a8ffea79568c8ee0f86b0ec9723e7f5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:24:13 +0000 Subject: [PATCH 111/192] libretro.gpsp: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/gpsp.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/gpsp.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ebcae71a522f..5fa0d079d5fe 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -161,14 +161,7 @@ lib.makeScope newScope (self: rec { genesis-plus-gx = self.callPackage ./cores/genesis-plus-gx.nix { }; - gpsp = mkLibretroCore { - core = "gpsp"; - makefile = "Makefile"; - meta = { - description = "Port of gpSP to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + gpsp = self.callPackage ./cores/gpsp.nix { }; gw = mkLibretroCore { core = "gw"; diff --git a/pkgs/applications/emulators/retroarch/cores/gpsp.nix b/pkgs/applications/emulators/retroarch/cores/gpsp.nix new file mode 100644 index 000000000000..e51e86e31be9 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/gpsp.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "gpsp"; + version = "unstable-2024-09-18"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "gpsp"; + rev = "36061caf8cc5e15c3c92fb772b6b8560c7c59ec7"; + hash = "sha256-o36OUdgm7p+rAMN6R2e2Lqi4oBLTyxziw7Lr20ERBg0="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of gpSP to libretro"; + homepage = "https://github.com/libretro/gpsp"; + license = lib.licenses.gpl2Only; + }; +} From 7fa34b63f8d49f461981dc94cc99a498184f3143 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:27:01 +0000 Subject: [PATCH 112/192] libretro.gw: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/gw.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/gw.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5fa0d079d5fe..24a168e349d9 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -163,14 +163,7 @@ lib.makeScope newScope (self: rec { gpsp = self.callPackage ./cores/gpsp.nix { }; - gw = mkLibretroCore { - core = "gw"; - makefile = "Makefile"; - meta = { - description = "Port of Game and Watch to libretro"; - license = lib.licenses.zlib; - }; - }; + gw = self.callPackage ./cores/gw.nix { }; handy = mkLibretroCore { core = "handy"; diff --git a/pkgs/applications/emulators/retroarch/cores/gw.nix b/pkgs/applications/emulators/retroarch/cores/gw.nix new file mode 100644 index 000000000000..a13eef2799f5 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/gw.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "gw"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "gw-libretro"; + rev = "435e5cfd4bf6aea03a84259e9b8dba3daf3ff5bd"; + hash = "sha256-csaOqrZMSk9xZUlGAKgypV38q9XE7K6hLLdBC10g9Ao="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Game and Watch to libretro"; + homepage = "https://github.com/libretro/gw-libretro"; + license = lib.licenses.zlib; + }; +} From 7cc0ad3bf932a6643b24a3221de5b0d0ff18d372 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:29:18 +0000 Subject: [PATCH 113/192] libretro.handy: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/handy.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/handy.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 24a168e349d9..02e47700346f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -165,14 +165,7 @@ lib.makeScope newScope (self: rec { gw = self.callPackage ./cores/gw.nix { }; - handy = mkLibretroCore { - core = "handy"; - makefile = "Makefile"; - meta = { - description = "Port of Handy to libretro"; - license = lib.licenses.zlib; - }; - }; + handy = self.callPackage ./cores/handy.nix { }; hatari = mkLibretroCore { core = "hatari"; diff --git a/pkgs/applications/emulators/retroarch/cores/handy.nix b/pkgs/applications/emulators/retroarch/cores/handy.nix new file mode 100644 index 000000000000..9dd5c58f9fcc --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/handy.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "handy"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-handy"; + rev = "4e9e072796e5552a9d57f6ab83b3f85f27b17fb6"; + hash = "sha256-ThzFEqLCX2JC06n6GZgkGzX5sFY5CxFDjkeekXRmbXY="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Handy to libretro"; + homepage = "https://github.com/libretro/libretro-handy"; + license = lib.licenses.zlib; + }; +} From 35ec5e76a0bcb9124b343acdedeb3277bcb285ba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:33:13 +0000 Subject: [PATCH 114/192] libretro.hatari: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +------- .../emulators/retroarch/cores/hatari.nix | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/hatari.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 02e47700346f..ce13f44c9efd 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -167,17 +167,7 @@ lib.makeScope newScope (self: rec { handy = self.callPackage ./cores/handy.nix { }; - hatari = mkLibretroCore { - core = "hatari"; - extraNativeBuildInputs = [ which ]; - dontConfigure = true; - # zlib is already included in mkLibretroCore as buildInputs - makeFlags = [ "EXTERNAL_ZLIB=1" ]; - meta = { - description = "Port of Hatari to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + hatari = self.callPackage ./cores/hatari.nix { }; mame = mkLibretroCore { core = "mame"; diff --git a/pkgs/applications/emulators/retroarch/cores/hatari.nix b/pkgs/applications/emulators/retroarch/cores/hatari.nix new file mode 100644 index 000000000000..e1ded94dc175 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/hatari.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + which, +}: +mkLibretroCore { + core = "hatari"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "hatari"; + rev = "7008194d3f951a157997f67a820578f56f7feee0"; + hash = "sha256-ZPzwUBaxs2ivE9n9cb5XB5mhixY9b6qIlq7OiVSLbqg="; + }; + + extraNativeBuildInputs = [ which ]; + dontConfigure = true; + # zlib is already included in mkLibretroCore as buildInputs + makeFlags = [ "EXTERNAL_ZLIB=1" ]; + + meta = { + description = "Port of Hatari to libretro"; + homepage = "https://github.com/libretro/hatari"; + license = lib.licenses.gpl2Only; + }; +} From fcd77c39f03355d8c0096109575762b637bffeba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:12:08 +0000 Subject: [PATCH 115/192] libretro.mame: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +----- .../emulators/retroarch/cores/mame.nix | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ce13f44c9efd..5d6479aef692 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -169,17 +169,7 @@ lib.makeScope newScope (self: rec { hatari = self.callPackage ./cores/hatari.nix { }; - mame = mkLibretroCore { - core = "mame"; - extraNativeBuildInputs = [ python3 ]; - extraBuildInputs = [ alsa-lib libGLU libGL ]; - # Setting this is breaking compilation of src/3rdparty/genie for some reason - makeFlags = [ "ARCH=" ]; - meta = { - description = "Port of MAME to libretro"; - license = with lib.licenses; [ bsd3 gpl2Plus ]; - }; - }; + mame = self.callPackage ./cores/mame.nix { }; mame2000 = mkLibretroCore { core = "mame2000"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame.nix b/pkgs/applications/emulators/retroarch/cores/mame.nix new file mode 100644 index 000000000000..20a8f8dd5cee --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + python3, + alsa-lib, + libGLU, + libGL, +}: +mkLibretroCore { + core = "mame"; + version = "unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame"; + rev = "a67797ad2f7516906ed7acef87569c6f35ca8739"; + hash = "sha256-MF6MWQftHBYL1Uv3ZYKFqCH24nd1+M73rhUzkdftMzk="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ + alsa-lib + libGLU + libGL + ]; + # Setting this is breaking compilation of src/3rdparty/genie for some reason + makeFlags = [ "ARCH=" ]; + + meta = { + description = "Port of MAME to libretro"; + homepage = "https://github.com/libretro/mame"; + license = with lib.licenses; [ + bsd3 + gpl2Plus + ]; + }; +} From 1d0c291d0deca2ca612bbf86ea8eb2ea3f991fa9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:15:49 +0000 Subject: [PATCH 116/192] libretro.mame2000: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/mame2000.nix | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2000.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5d6479aef692..ed809ceaa73d 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -171,16 +171,7 @@ lib.makeScope newScope (self: rec { mame = self.callPackage ./cores/mame.nix { }; - mame2000 = mkLibretroCore { - core = "mame2000"; - makefile = "Makefile"; - makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; - meta = { - description = "Port of MAME ~2000 to libretro, compatible with MAME 0.37b5 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2000 = self.callPackage ./cores/mame2000.nix { }; mame2003 = mkLibretroCore { core = "mame2003"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2000.nix b/pkgs/applications/emulators/retroarch/cores/mame2000.nix new file mode 100644 index 000000000000..f9ece98f68f5 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2000.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mame2000"; + version = "unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2000-libretro"; + rev = "2ec60f6e1078cf9ba173e80432cc28fd4eea200f"; + hash = "sha256-AYZj7bvO9oc7wmEBbj6DPRzpQFHl8diIcunSSpD4Vok="; + }; + + makefile = "Makefile"; + makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; + + meta = { + description = "Port of MAME ~2000 to libretro, compatible with MAME 0.37b5 sets"; + homepage = "https://github.com/libretro/mame2000-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} From 2aff2348475301282b5572a8ed3ad7e6e5015faa Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:20:20 +0000 Subject: [PATCH 117/192] libretro.mame2003: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/mame2003.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2003.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ed809ceaa73d..27e6feed4d96 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -173,15 +173,7 @@ lib.makeScope newScope (self: rec { mame2000 = self.callPackage ./cores/mame2000.nix { }; - mame2003 = mkLibretroCore { - core = "mame2003"; - makefile = "Makefile"; - meta = { - description = "Port of MAME ~2003 to libretro, compatible with MAME 0.78 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2003 = self.callPackage ./cores/mame2003.nix { }; mame2003-plus = mkLibretroCore { core = "mame2003-plus"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2003.nix b/pkgs/applications/emulators/retroarch/cores/mame2003.nix new file mode 100644 index 000000000000..96786a4c1a0e --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2003.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mame2003"; + version = "unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2003-libretro"; + rev = "6d543115531fc96422b73c989a628600cacbea50"; + hash = "sha256-jFzFQVB0uiSRa82sq1fiMEXyzzDJqRANNgq5hj/ZAl4="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of MAME ~2003 to libretro, compatible with MAME 0.78 sets"; + homepage = "https://github.com/libretro/mame2003-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} From 5dab5710c5c11fbab7bef13c3291cbdc86e28118 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:25:45 +0000 Subject: [PATCH 118/192] libretro.mame2003-plus: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/mame2003-plus.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 27e6feed4d96..aaec6a7f9d89 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -175,15 +175,7 @@ lib.makeScope newScope (self: rec { mame2003 = self.callPackage ./cores/mame2003.nix { }; - mame2003-plus = mkLibretroCore { - core = "mame2003-plus"; - makefile = "Makefile"; - meta = { - description = "Port of MAME ~2003+ to libretro, compatible with MAME 0.78 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2003-plus = self.callPackage ./cores/mame2003-plus.nix { }; mame2010 = mkLibretroCore { core = "mame2010"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix b/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix new file mode 100644 index 000000000000..048211d985c3 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mame2003-plus"; + version = "unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2003-plus-libretro"; + rev = "b00ea1c9574126d75ae7b80c3b41e1186421fc1d"; + hash = "sha256-Zq4P5UsZh3p9/zasfTC+pzWiLAo7T2qAgZw4bJ4ADdM="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of MAME ~2003+ to libretro, compatible with MAME 0.78 sets"; + homepage = "https://github.com/libretro/mame2003-plus-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} From 3bb5ff0ceb41d527e15e43ef6b9933cf72dd8e40 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:28:49 +0000 Subject: [PATCH 119/192] libretro.mame2010: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------ .../emulators/retroarch/cores/mame2010.nix | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2010.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index aaec6a7f9d89..b2663cd42d39 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -177,16 +177,7 @@ lib.makeScope newScope (self: rec { mame2003-plus = self.callPackage ./cores/mame2003-plus.nix { }; - mame2010 = mkLibretroCore { - core = "mame2010"; - makefile = "Makefile"; - makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; - meta = { - description = "Port of MAME ~2010 to libretro, compatible with MAME 0.139 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2010 = self.callPackage ./cores/mame2010.nix { }; mame2015 = mkLibretroCore { core = "mame2015"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2010.nix b/pkgs/applications/emulators/retroarch/cores/mame2010.nix new file mode 100644 index 000000000000..529c79b7d9be --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2010.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mame2010"; + version = "unstable-2024-10-23"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2010-libretro"; + rev = "c5b413b71e0a290c57fc351562cd47ba75bac105"; + hash = "sha256-p+uEhxjr/07YJxInhW7oJDr8KurD36JxnSfJo17FOxM="; + }; + + makefile = "Makefile"; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ + "PTR64=1" + "ARM_ENABLED=1" + "X86_SH2DRC=0" + "FORCE_DRC_C_BACKEND=1" + ]; + + meta = { + description = "Port of MAME ~2010 to libretro, compatible with MAME 0.139 sets"; + homepage = "https://github.com/libretro/mame2010-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} From 45e8e2e77977f57617a1a510fc821e27fd310127 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:33:59 +0000 Subject: [PATCH 120/192] libretro.mame2015: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 16 +-------- .../emulators/retroarch/cores/mame2015.nix | 32 ++++++++++++++++++ .../emulators/retroarch/cores/mame2016.nix | 33 +++++++++++++++++++ .../patches/mame2015-python311.patch | 0 .../patches/mame2016-python311.patch | 0 5 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2015.nix create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2016.nix rename pkgs/applications/emulators/retroarch/{ => cores}/patches/mame2015-python311.patch (100%) rename pkgs/applications/emulators/retroarch/{ => cores}/patches/mame2016-python311.patch (100%) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index b2663cd42d39..640aaaa44aa5 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -179,21 +179,7 @@ lib.makeScope newScope (self: rec { mame2010 = self.callPackage ./cores/mame2010.nix { }; - mame2015 = mkLibretroCore { - core = "mame2015"; - patches = [ ./patches/mame2015-python311.patch ]; - makeFlags = [ "PYTHON=python3" ]; - extraNativeBuildInputs = [ python3 ]; - extraBuildInputs = [ alsa-lib ]; - makefile = "Makefile"; - # Build failures when this is set to a bigger number - NIX_BUILD_CORES = 8; - meta = { - description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2015 = self.callPackage ./cores/mame2015.nix { }; mame2016 = mkLibretroCore { core = "mame2016"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2015.nix b/pkgs/applications/emulators/retroarch/cores/mame2015.nix new file mode 100644 index 000000000000..797c7f80e0a3 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2015.nix @@ -0,0 +1,32 @@ +{ + lib, + alsa-lib, + fetchFromGitHub, + mkLibretroCore, + python3, +}: +mkLibretroCore { + core = "mame2015"; + version = "unstable-2023-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2015-libretro"; + rev = "316cd06349f2b34b4719f04f7c0d07569a74c764"; + hash = "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0="; + }; + + patches = [ ./patches/mame2015-python311.patch ]; + makeFlags = [ "PYTHON=python3" ]; + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ alsa-lib ]; + makefile = "Makefile"; + # Build failures when this is set to a bigger number + NIX_BUILD_CORES = 8; + meta = { + description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets"; + homepage = "https://github.com/libretro/mame2015-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} diff --git a/pkgs/applications/emulators/retroarch/cores/mame2016.nix b/pkgs/applications/emulators/retroarch/cores/mame2016.nix new file mode 100644 index 000000000000..fb3d61964344 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2016.nix @@ -0,0 +1,33 @@ +{ + lib, + alsa-lib, + fetchfromgithub, + mklibretrocore, + python3, +}: +mklibretrocore { + core = "mame2016"; + version = "unstable-2024-04-06"; + + "src": { + "owner": "libretro", + "repo": "mame2016-libretro", + "rev": "01058613a0109424c4e7211e49ed83ac950d3993", + "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" + }, + + patches = [ ./patches/mame2015-python311.patch ]; + makeflags = [ "python=python3" ]; + extranativebuildinputs = [ python3 ]; + extrabuildinputs = [ alsa-lib ]; + makefile = "makefile"; + # build failures when this is set to a bigger number + nix_build_cores = 8; + + meta = { + description = "port of mame ~2015 to libretro, compatible with mame 0.160 sets"; + homepage = "https://github.com/libretro/mame2015-libretro"; + # mame license, non-commercial clause + license = lib.licenses.unfreeredistributable; + }; +} diff --git a/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch b/pkgs/applications/emulators/retroarch/cores/patches/mame2015-python311.patch similarity index 100% rename from pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch rename to pkgs/applications/emulators/retroarch/cores/patches/mame2015-python311.patch diff --git a/pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch b/pkgs/applications/emulators/retroarch/cores/patches/mame2016-python311.patch similarity index 100% rename from pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch rename to pkgs/applications/emulators/retroarch/cores/patches/mame2016-python311.patch From 21a3d16115a6947ae9e94af87f97294dcb9ba95d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:39:19 +0000 Subject: [PATCH 121/192] libretro.mame2016: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 16 +------ .../emulators/retroarch/cores/mame2016.nix | 43 ++++++++++--------- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 640aaaa44aa5..2d28737fcc2e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -181,21 +181,7 @@ lib.makeScope newScope (self: rec { mame2015 = self.callPackage ./cores/mame2015.nix { }; - mame2016 = mkLibretroCore { - core = "mame2016"; - patches = [ ./patches/mame2016-python311.patch ]; - extraNativeBuildInputs = [ python3 ]; - extraBuildInputs = [ alsa-lib ]; - makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; - # Build failures when this is set to a bigger number - NIX_BUILD_CORES = 8; - # Fix build errors in GCC13 - NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; - meta = { - description = "Port of MAME ~2016 to libretro, compatible with MAME 0.174 sets"; - license = with lib.licenses; [ bsd3 gpl2Plus ]; - }; - }; + mame2016 = self.callPackage ./cores/mame2016.nix { }; melonds = mkLibretroCore { core = "melonds"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2016.nix b/pkgs/applications/emulators/retroarch/cores/mame2016.nix index fb3d61964344..a98b98a7ace0 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2016.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2016.nix @@ -1,33 +1,36 @@ { lib, alsa-lib, - fetchfromgithub, - mklibretrocore, + fetchFromGitHub, + mkLibretroCore, python3, }: -mklibretrocore { +mkLibretroCore { core = "mame2016"; version = "unstable-2024-04-06"; - "src": { - "owner": "libretro", - "repo": "mame2016-libretro", - "rev": "01058613a0109424c4e7211e49ed83ac950d3993", - "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" - }, + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2016-libretro"; + rev = "01058613a0109424c4e7211e49ed83ac950d3993"; + hash = "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak="; + }; - patches = [ ./patches/mame2015-python311.patch ]; - makeflags = [ "python=python3" ]; - extranativebuildinputs = [ python3 ]; - extrabuildinputs = [ alsa-lib ]; - makefile = "makefile"; - # build failures when this is set to a bigger number - nix_build_cores = 8; + patches = [ ./patches/mame2016-python311.patch ]; + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ alsa-lib ]; + makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; + # Build failures when this is set to a bigger number + NIX_BUILD_CORES = 8; + # Fix build errors in GCC13 + NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; meta = { - description = "port of mame ~2015 to libretro, compatible with mame 0.160 sets"; - homepage = "https://github.com/libretro/mame2015-libretro"; - # mame license, non-commercial clause - license = lib.licenses.unfreeredistributable; + description = "Port of MAME ~2016 to libretro, compatible with MAME 0.174 sets"; + homepage = "https://github.com/libretro/mame2016-libretro"; + license = with lib.licenses; [ + bsd3 + gpl2Plus + ]; }; } From bd99bc46159b80e8c3d435bde052563e8b1e884e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 18:50:09 +0000 Subject: [PATCH 122/192] libretro.melonds: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------ .../emulators/retroarch/cores/melonds.nix | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/melonds.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 2d28737fcc2e..34cf35ee8b56 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -183,15 +183,7 @@ lib.makeScope newScope (self: rec { mame2016 = self.callPackage ./cores/mame2016.nix { }; - melonds = mkLibretroCore { - core = "melonds"; - extraBuildInputs = [ libGL libGLU ]; - makefile = "Makefile"; - meta = { - description = "Port of MelonDS to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + melonds = self.callPackage ./cores/melonds.nix { }; mesen = mkLibretroCore { core = "mesen"; diff --git a/pkgs/applications/emulators/retroarch/cores/melonds.nix b/pkgs/applications/emulators/retroarch/cores/melonds.nix new file mode 100644 index 000000000000..a7adaf2fbb3b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/melonds.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + libGLU, + libGL, +}: +mkLibretroCore { + core = "melonds"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "melonds"; + rev = "7a3c11ff970cd36ca806961fae6db94b30dd5401"; + hash = "sha256-YGkRdth7qdATcZpJkBd5MGOJFG1AbeJhAnyir+ssZYA="; + }; + + extraBuildInputs = [ + libGLU + libGL + ]; + makefile = "Makefile"; + + meta = { + description = "Port of MelonDS to libretro"; + homepage = "https://github.com/libretro/melonds"; + license = lib.licenses.gpl3Only; + }; +} From 87fbbb55802b669257d695529038ccecf9999e1c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 18:53:36 +0000 Subject: [PATCH 123/192] libretro.mesen: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/mesen.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mesen.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 34cf35ee8b56..faaa202548e0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -185,15 +185,7 @@ lib.makeScope newScope (self: rec { melonds = self.callPackage ./cores/melonds.nix { }; - mesen = mkLibretroCore { - core = "mesen"; - makefile = "Makefile"; - preBuild = "cd Libretro"; - meta = { - description = "Port of Mesen to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + mesen = self.callPackage ./cores/mesen.nix { }; mesen-s = mkLibretroCore { core = "mesen-s"; diff --git a/pkgs/applications/emulators/retroarch/cores/mesen.nix b/pkgs/applications/emulators/retroarch/cores/mesen.nix new file mode 100644 index 000000000000..8f75096ff72c --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mesen.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mesen"; + version = "unstable-2024-06-09"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mesen"; + rev = "91db6be681f70b2080525c267af6132555323ea1"; + hash = "sha256-rw/bwHaeglO/DPeOCFHAWF5Y5DXVKiteO4bWZjTB4rI="; + }; + + makefile = "Makefile"; + preBuild = "cd Libretro"; + + meta = { + description = "Port of Mesen to libretro"; + homepage = "https://github.com/libretro/mesen"; + license = lib.licenses.gpl3Only; + }; +} From 0d96487b33262a8e36039978c982bd365c91f618 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 18:55:27 +0000 Subject: [PATCH 124/192] libretro.mesen-s: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/mesen-s.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mesen-s.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index faaa202548e0..e1488eee3e52 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -187,16 +187,7 @@ lib.makeScope newScope (self: rec { mesen = self.callPackage ./cores/mesen.nix { }; - mesen-s = mkLibretroCore { - core = "mesen-s"; - makefile = "Makefile"; - preBuild = "cd Libretro"; - normalizeCore = false; - meta = { - description = "Port of Mesen-S to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + mesen-s = self.callPackage ./cores/mesen-s.nix { }; meteor = mkLibretroCore { core = "meteor"; diff --git a/pkgs/applications/emulators/retroarch/cores/mesen-s.nix b/pkgs/applications/emulators/retroarch/cores/mesen-s.nix new file mode 100644 index 000000000000..5c4ad5996e58 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mesen-s.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mesen-s"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mesen-s"; + rev = "d4fca31a6004041d99b02199688f84c009c55967"; + hash = "sha256-mGGTLBRJCsNJg57LWSFndIv/LLzEmVRnv6gNbllkV/Y="; + }; + + makefile = "Makefile"; + preBuild = "cd Libretro"; + normalizeCore = false; + + meta = { + description = "Port of Mesen-S to libretro"; + homepage = "https://github.com/libretro/mesen-s"; + license = lib.licenses.gpl3Only; + }; +} From 13130827a8a4ca93328469646c0e592834e6aab2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 18:58:25 +0000 Subject: [PATCH 125/192] libretro.meteor: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/meteor.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/meteor.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e1488eee3e52..ad89bea5d98e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -189,15 +189,7 @@ lib.makeScope newScope (self: rec { mesen-s = self.callPackage ./cores/mesen-s.nix { }; - meteor = mkLibretroCore { - core = "meteor"; - makefile = "Makefile"; - preBuild = "cd libretro"; - meta = { - description = "Port of Meteor to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + meteor = self.callPackage ./cores/meteor.nix { }; mgba = mkLibretroCore { core = "mgba"; diff --git a/pkgs/applications/emulators/retroarch/cores/meteor.nix b/pkgs/applications/emulators/retroarch/cores/meteor.nix new file mode 100644 index 000000000000..c6e656f698af --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/meteor.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "meteor"; + version = "unstable-2020-12-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "meteor-libretro"; + rev = "e533d300d0561564451bde55a2b73119c768453c"; + hash = "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ="; + }; + + makefile = "Makefile"; + preBuild = "cd libretro"; + + meta = { + description = "Port of Meteor to libretro"; + homepage = "https://github.com/libretro/meteor"; + license = lib.licenses.gpl3Only; + }; +} From c6f6b7bd4a118c6c9f2cd18b95b5ac94f66050c4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 19:00:13 +0000 Subject: [PATCH 126/192] libretro.mgba: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/mgba.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mgba.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ad89bea5d98e..8e2b7acaf0ca 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -191,13 +191,7 @@ lib.makeScope newScope (self: rec { meteor = self.callPackage ./cores/meteor.nix { }; - mgba = mkLibretroCore { - core = "mgba"; - meta = { - description = "Port of mGBA to libretro"; - license = lib.licenses.mpl20; - }; - }; + mgba = self.callPackage ./cores/mgba.nix { }; mrboom = mkLibretroCore { core = "mrboom"; diff --git a/pkgs/applications/emulators/retroarch/cores/mgba.nix b/pkgs/applications/emulators/retroarch/cores/mgba.nix new file mode 100644 index 000000000000..e2f683345740 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mgba.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mgba"; + version = "unstable-2024-11-12"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mgba"; + rev = "747362c02d2e71ee7c363e8dcb240925be8af906"; + hash = "sha256-dBhdS6C1H02iwdYDVvJmkPWob81vpmQJdHUHJFAq2vo="; + }; + + meta = { + description = "Port of mGBA to libretro"; + homepage = "https://github.com/libretro/mgba"; + license = lib.licenses.mpl20; + }; +} From 418e948588356a1b9f04d046ea874c81452db9c4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:10:05 +0000 Subject: [PATCH 127/192] libretro.mrboom: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/mrboom.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mrboom.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 8e2b7acaf0ca..8151a3df5b63 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -193,14 +193,7 @@ lib.makeScope newScope (self: rec { mgba = self.callPackage ./cores/mgba.nix { }; - mrboom = mkLibretroCore { - core = "mrboom"; - makefile = "Makefile"; - meta = { - description = "Port of Mr.Boom to libretro"; - license = lib.licenses.mit; - }; - }; + mrboom = self.callPackage ./cores/mrboom.nix { }; mupen64plus = mkLibretroCore { core = "mupen64plus-next"; diff --git a/pkgs/applications/emulators/retroarch/cores/mrboom.nix b/pkgs/applications/emulators/retroarch/cores/mrboom.nix new file mode 100644 index 000000000000..017c8325df69 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mrboom.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore rec { + core = "mrboom"; + version = "unstable-2024-07-01"; + + src = fetchFromGitHub { + owner = "Javanaise"; + repo = "mrboom-libretro"; + rev = "22765ce7176d236d846f504318a51c448d2b469b"; + hash = "sha256-hzdc4PM/EARNEtpeATo4VohXtkeBra6rCz3tdIgBfVw="; + fetchSubmodules = true; + }; + + makefile = "Makefile"; + makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; + + meta = { + description = "Port of Mr.Boom to libretro"; + homepage = "https://github.com/Javanaise/mrboom-libretro"; + license = lib.licenses.mit; + }; +} From 87c06feb0129fdc0efb76447e11bb7d8f3a68f44 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:16:46 +0000 Subject: [PATCH 128/192] libretro.mupen64plus: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 18 +------- .../emulators/retroarch/cores/mupen64plus.nix | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+), 17 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mupen64plus.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 8151a3df5b63..9968263b3b57 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -195,23 +195,7 @@ lib.makeScope newScope (self: rec { mrboom = self.callPackage ./cores/mrboom.nix { }; - mupen64plus = mkLibretroCore { - core = "mupen64plus-next"; - repo = "mupen64plus"; - extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ]; - makefile = "Makefile"; - makeFlags = [ - "HAVE_PARALLEL_RDP=1" - "HAVE_PARALLEL_RSP=1" - "HAVE_THR_AL=1" - "LLE=1" - "WITH_DYNAREC=${stdenv.hostPlatform.parsed.cpu.name}" - ]; - meta = { - description = "Libretro port of Mupen64 Plus, GL only"; - license = lib.licenses.gpl3Only; - }; - }; + mupen64plus = self.callPackage ./cores/mupen64plus.nix { }; neocd = mkLibretroCore { core = "neocd"; diff --git a/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix b/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix new file mode 100644 index 000000000000..41aff713cba6 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libGL, + libGLU, + libpng, + mkLibretroCore, + nasm, + xorg, +}: +mkLibretroCore { + core = "mupen64plus-next"; + version = "unstable-2024-10-29"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mupen64plus-libretro-nx"; + rev = "4249e39b2c200e5f0895385f76d99928785f2bea"; + hash = "sha256-nII/PMYo2xLznmAcKs6jDWGRS1DC3tiDeT6KJKRnaCI="; + }; + + extraBuildInputs = [ + libGLU + libGL + libpng + nasm + xorg.libX11 + ]; + makefile = "Makefile"; + makeFlags = [ + "HAVE_PARALLEL_RDP=1" + "HAVE_PARALLEL_RSP=1" + "HAVE_THR_AL=1" + "LLE=1" + "WITH_DYNAREC=${stdenv.hostPlatform.parsed.cpu.name}" + ]; + + meta = { + description = "Libretro port of Mupen64 Plus"; + homepage = "https://github.com/libretro/mupen64plus-libretro-nx"; + license = lib.licenses.gpl3Only; + }; +} From baa6a603be37cff416a12d8a95832872b0fd5826 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:34:18 +0000 Subject: [PATCH 129/192] libretro.neocd: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/neocd.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/neocd.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 9968263b3b57..765caee7a9f9 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -197,14 +197,7 @@ lib.makeScope newScope (self: rec { mupen64plus = self.callPackage ./cores/mupen64plus.nix { }; - neocd = mkLibretroCore { - core = "neocd"; - makefile = "Makefile"; - meta = { - description = "NeoCD libretro port"; - license = lib.licenses.lgpl3Only; - }; - }; + neocd = self.callPackage ./cores/neocd.nix { }; nestopia = mkLibretroCore { core = "nestopia"; diff --git a/pkgs/applications/emulators/retroarch/cores/neocd.nix b/pkgs/applications/emulators/retroarch/cores/neocd.nix new file mode 100644 index 000000000000..17c74d6ab92f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/neocd.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "neocd"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "neocd_libretro"; + rev = "5eca2c8fd567b5261251c65ecafa8cf5b179d1d2"; + hash = "sha256-72tmPCb7AXsamaQsMAPiYpgDR8DER2GTz4hcbN8wy7g="; + }; + + makefile = "Makefile"; + + meta = { + description = "NeoCD libretro port"; + homepage = "https://github.com/libretro/neocd_libretro"; + license = lib.licenses.lgpl3Only; + }; +} From 6f50f7cd46b20d91457e9fe1523b9d35cbe83ff7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:36:21 +0000 Subject: [PATCH 130/192] libretro.nestopia: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/nestopia.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/nestopia.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 765caee7a9f9..76dbebe9012e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -199,15 +199,7 @@ lib.makeScope newScope (self: rec { neocd = self.callPackage ./cores/neocd.nix { }; - nestopia = mkLibretroCore { - core = "nestopia"; - makefile = "Makefile"; - preBuild = "cd libretro"; - meta = { - description = "Nestopia libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + nestopia = self.callPackage ./cores/nestopia.nix { }; nxengine = mkLibretroCore { core = "nxengine"; diff --git a/pkgs/applications/emulators/retroarch/cores/nestopia.nix b/pkgs/applications/emulators/retroarch/cores/nestopia.nix new file mode 100644 index 000000000000..4d881e69b281 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/nestopia.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "nestopia"; + version = "unstable-2024-10-17"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "nestopia"; + rev = "b932740e8abbe2cda80d06b083fdd8115af1c5d5"; + hash = "sha256-lIWk3V93vTKZM/jvfLkA06c7DDSEQtLmqRzJUi0TK/4="; + }; + + makefile = "Makefile"; + preBuild = "cd libretro"; + + meta = { + description = "Nestopia libretro port"; + homepage = "https://github.com/libretro/nestopia"; + license = lib.licenses.gpl2Only; + }; +} From b336ab6fa3a8b7ea2550d124032491e9cddba5cb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:40:21 +0000 Subject: [PATCH 131/192] libretro.nxengine: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/nxengine.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/nxengine.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 76dbebe9012e..36edc7cbcd98 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -201,14 +201,7 @@ lib.makeScope newScope (self: rec { nestopia = self.callPackage ./cores/nestopia.nix { }; - nxengine = mkLibretroCore { - core = "nxengine"; - makefile = "Makefile"; - meta = { - description = "NXEngine libretro port"; - license = lib.licenses.gpl3Only; - }; - }; + nxengine = self.callPackage ./cores/nxengine.nix { }; np2kai = mkLibretroCore rec { core = "np2kai"; diff --git a/pkgs/applications/emulators/retroarch/cores/nxengine.nix b/pkgs/applications/emulators/retroarch/cores/nxengine.nix new file mode 100644 index 000000000000..6754dd7a3926 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/nxengine.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "nxengine"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "nxengine-libretro"; + rev = "9adc032a5f6aa913d71d22042bb72cb11cf0f4a2"; + hash = "sha256-8XjZp18lQU3xFNDjIuNsSHn7Mhba8Lze/IeRsy8/U1U="; + }; + + makefile = "Makefile"; + + meta = { + description = "NXEngine libretro port"; + homepage = "https://github.com/libretro/nxengine-libretro"; + license = lib.licenses.gpl3Only; + }; +} From d9c95ab53e4d71f90ac75e0b29a142e0d6926b0c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:53:47 +0000 Subject: [PATCH 132/192] libretro.np2kai: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 16 ++-------- .../emulators/retroarch/cores/np2kai.nix | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/np2kai.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 36edc7cbcd98..1e617d342980 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -201,21 +201,9 @@ lib.makeScope newScope (self: rec { nestopia = self.callPackage ./cores/nestopia.nix { }; - nxengine = self.callPackage ./cores/nxengine.nix { }; + np2kai = self.callPackage ./cores/np2kai.nix { }; - np2kai = mkLibretroCore rec { - core = "np2kai"; - makeFlags = [ - # See https://github.com/AZO234/NP2kai/tags - "NP2KAI_VERSION=rev.22" - "NP2KAI_HASH=${(getCoreSrc core).rev}" - ]; - preBuild = "cd sdl"; - meta = { - description = "Neko Project II kai libretro port"; - license = lib.licenses.mit; - }; - }; + nxengine = self.callPackage ./cores/nxengine.nix { }; o2em = mkLibretroCore { core = "o2em"; diff --git a/pkgs/applications/emulators/retroarch/cores/np2kai.nix b/pkgs/applications/emulators/retroarch/cores/np2kai.nix new file mode 100644 index 000000000000..f840b04327cf --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/np2kai.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore rec { + core = "np2kai"; + version = "unstable-2024-11-03"; + + src = fetchFromGitHub { + owner = "AZO234"; + repo = "NP2kai"; + rev = "4b109eaac4f79b04065ff5025319fce51537e04d"; + hash = "sha256-tRFvK8d5Y/umy/b1BKN85ZSaDWyK95hII4RVng7A5uU="; + fetchSubmodules = true; + }; + + makeFlags = [ + # See https://github.com/AZO234/NP2kai/tags + "NP2KAI_VERSION=rev.22" + "NP2KAI_HASH=${builtins.substring 0 7 src.rev}" + ]; + + preBuild = "cd sdl"; + + meta = { + description = "Neko Project II kai libretro port"; + homepage = "https://github.com/AZO234/NP2kai"; + license = lib.licenses.mit; + }; +} From 45d04e07a4d20b944111f952bcfcda2f668b2dec Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:33:26 +0000 Subject: [PATCH 133/192] libretro.o2em: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/o2em.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/o2em.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 1e617d342980..555e0db1c1d6 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -205,14 +205,7 @@ lib.makeScope newScope (self: rec { nxengine = self.callPackage ./cores/nxengine.nix { }; - o2em = mkLibretroCore { - core = "o2em"; - makefile = "Makefile"; - meta = { - description = "Port of O2EM to libretro"; - license = lib.licenses.artistic1; - }; - }; + o2em = self.callPackage ./cores/o2em.nix { }; opera = mkLibretroCore { core = "opera"; diff --git a/pkgs/applications/emulators/retroarch/cores/o2em.nix b/pkgs/applications/emulators/retroarch/cores/o2em.nix new file mode 100644 index 000000000000..504deb49a268 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/o2em.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "o2em"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-o2em"; + rev = "c8f458d035392963823fbb50db0cec0033d9315f"; + hash = "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of O2EM to libretro"; + homepage = "https://github.com/libretro/libretro-o2em"; + license = lib.licenses.artistic1; + }; +} From e1dcc59e2868bc4bff1ec1bfb7b511091ed4e75d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:36:11 +0000 Subject: [PATCH 134/192] libretro.opera: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/opera.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/opera.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 555e0db1c1d6..f3d922b7a7a7 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -207,16 +207,7 @@ lib.makeScope newScope (self: rec { o2em = self.callPackage ./cores/o2em.nix { }; - opera = mkLibretroCore { - core = "opera"; - makefile = "Makefile"; - makeFlags = [ "CC_PREFIX=${stdenv.cc.targetPrefix}" ]; - meta = { - description = "Opera is a port of 4DO/libfreedo to libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + opera = self.callPackage ./cores/opera.nix { }; parallel-n64 = mkLibretroCore { core = "parallel-n64"; diff --git a/pkgs/applications/emulators/retroarch/cores/opera.nix b/pkgs/applications/emulators/retroarch/cores/opera.nix new file mode 100644 index 000000000000..90e273c6d2b3 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/opera.nix @@ -0,0 +1,26 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "opera"; + version = "unstable-2024-10-17"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "opera-libretro"; + rev = "67a29e60a4d194b675c9272b21b61eaa022f3ba3"; + hash = "sha256-8896EWNbzVyr3MS1jtWD3pLur7ZvAhhJmrwkW3ayzkU="; + }; + + makefile = "Makefile"; + makeFlags = [ "CC_PREFIX=${stdenv.cc.targetPrefix}" ]; + + meta = { + description = "Opera is a port of 4DO/libfreedo to libretro"; + homepage = "https://github.com/libretro/libretro-o2em"; + license = lib.licenses.unfreeRedistributable; + }; +} From 1556d2c6de2ba0d623d035806c3ba8268dcbb910 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:43:15 +0000 Subject: [PATCH 135/192] libretro.parallel-n64: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 19 +-------- .../retroarch/cores/parallel-n64.nix | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/parallel-n64.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index f3d922b7a7a7..65c6a342dde3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -209,24 +209,7 @@ lib.makeScope newScope (self: rec { opera = self.callPackage ./cores/opera.nix { }; - parallel-n64 = mkLibretroCore { - core = "parallel-n64"; - extraBuildInputs = [ libGLU libGL libpng ]; - makefile = "Makefile"; - makeFlags = [ - "HAVE_PARALLEL=1" - "HAVE_PARALLEL_RSP=1" - "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' - sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ - && sed -i -e 's,CPUFLAGS :=,,g' Makefile - ''; - meta = { - description = "Parallel Mupen64plus rewrite for libretro"; - license = lib.licenses.gpl3Only; - }; - }; + parallel-n64 = self.callPackage ./cores/parallel-n64.nix { }; pcsx2 = mkLibretroCore { core = "pcsx2"; diff --git a/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix b/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix new file mode 100644 index 000000000000..f6ba71d47c63 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libGL, + libGLU, + libpng, + mkLibretroCore, +}: +mkLibretroCore { + core = "parallel-n64"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "parallel-n64"; + rev = "e372c5e327dcd649e9d840ffc3d88480b6866eda"; + hash = "sha256-q4octB5XDdl4PtLYVZfBgydVBNaOwzu9dPBY+Y68lVo="; + }; + + extraBuildInputs = [ + libGLU + libGL + libpng + ]; + makefile = "Makefile"; + makeFlags = [ + "HAVE_PARALLEL=1" + "HAVE_PARALLEL_RSP=1" + "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' + sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ + && sed -i -e 's,CPUFLAGS :=,,g' Makefile + ''; + + meta = { + description = "Parallel Mupen64plus rewrite for libretro"; + homepage = "https://github.com/libretro/parallel-n64"; + license = lib.licenses.gpl3Only; + }; +} From bbb92a0b2700def4c2dc9bf769d5eec85c8376d9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:49:32 +0000 Subject: [PATCH 136/192] libretro.pcsx2: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 37 +---------- .../emulators/retroarch/cores/pcsx2.nix | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+), 36 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/pcsx2.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 65c6a342dde3..c0b1919c4bc3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -211,42 +211,7 @@ lib.makeScope newScope (self: rec { parallel-n64 = self.callPackage ./cores/parallel-n64.nix { }; - pcsx2 = mkLibretroCore { - core = "pcsx2"; - extraNativeBuildInputs = [ - cmake - gettext - pkg-config - ]; - extraBuildInputs = [ - libaio - libGL - libGLU - libpcap - libpng - libxml2 - xz - xxd - ]; - makefile = "Makefile"; - cmakeFlags = [ "-DLIBRETRO=ON" ]; - # remove ccache - postPatch = '' - substituteInPlace CMakeLists.txt --replace "ccache" "" - ''; - postBuild = "cd pcsx2"; - # causes redefinition of _FORTIFY_SOURCE - hardeningDisable = [ "fortify3" ]; - # FIXME: multiple build errors with GCC13. - # Unlikely to be fixed until we switch to libretro/pcsx2 that is a more - # up-to-date port (but still WIP). - stdenv = gcc12Stdenv; - meta = { - description = "Port of PCSX2 to libretro"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.x86; - }; - }; + pcsx2 = self.callPackage ./cores/pcsx2.nix { }; pcsx-rearmed = mkLibretroCore { core = "pcsx_rearmed"; diff --git a/pkgs/applications/emulators/retroarch/cores/pcsx2.nix b/pkgs/applications/emulators/retroarch/cores/pcsx2.nix new file mode 100644 index 000000000000..d24311b4df62 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/pcsx2.nix @@ -0,0 +1,64 @@ +{ + lib, + cmake, + fetchFromGitHub, + gcc12Stdenv, + gettext, + libGL, + libGLU, + libaio, + libpcap, + libpng, + libxml2, + mkLibretroCore, + pkg-config, + xxd, + xz, +}: +mkLibretroCore { + core = "pcsx2"; + version = "unstable-2023-01-30"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "lrps2"; + rev = "f3c8743d6a42fe429f703b476fecfdb5655a98a9"; + hash = "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4="; + }; + + extraNativeBuildInputs = [ + cmake + gettext + pkg-config + ]; + extraBuildInputs = [ + libaio + libGL + libGLU + libpcap + libpng + libxml2 + xz + xxd + ]; + makefile = "Makefile"; + cmakeFlags = [ "-DLIBRETRO=ON" ]; + # remove ccache + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail "ccache" "" + ''; + postBuild = "cd pcsx2"; + # causes redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + # FIXME: multiple build errors with GCC13. + # Unlikely to be fixed until we switch to libretro/pcsx2 that is a more + # up-to-date port (but still WIP). + stdenv = gcc12Stdenv; + + meta = { + description = "Port of PCSX2 to libretro"; + homepage = "https://github.com/libretro/lrps2"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.x86; + }; +} From 54b719f02d11e63acc68d2c9e3fa877f23773cb3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:54:56 +0000 Subject: [PATCH 137/192] libretro.pcsx-rearmed: renamed from pcsx_rearmed, move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 ++------ .../retroarch/cores/pcsx-rearmed.nix | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c0b1919c4bc3..89049803bea1 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -213,14 +213,8 @@ lib.makeScope newScope (self: rec { pcsx2 = self.callPackage ./cores/pcsx2.nix { }; - pcsx-rearmed = mkLibretroCore { - core = "pcsx_rearmed"; - dontConfigure = true; - meta = { - description = "Port of PCSX ReARMed with GNU lightning to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + pcsx-rearmed = self.callPackage ./cores/pcsx-rearmed.nix { }; + pcsx_rearmed = lib.lowPrio(self.pcsx-rearmed); # added 2024-11-20 picodrive = mkLibretroCore { core = "picodrive"; diff --git a/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix new file mode 100644 index 000000000000..92405ee175b9 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "pcsx-rearmed"; + version = "unstable-2024-11-17"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "pcsx_rearmed"; + rev = "e3d7ea45c75f2752e351d5c5b54cf7e79e66d26e"; + hash = "sha256-dJqomyUHYQ+vpyu7/w2S/NidgYbHiGBWjebFQAXjzI0="; + }; + + dontConfigure = true; + + meta = { + description = "Port of PCSX ReARMed to libretro"; + homepage = "https://github.com/libretro/pcsx_rearmed"; + license = lib.licenses.gpl2Only; + }; +} From 6defc5ebb7876b50fa65759e14998b8badabd89e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:05:13 +0000 Subject: [PATCH 138/192] libretro.picodrive: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/picodrive.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/picodrive.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 89049803bea1..dfd2b2f76a06 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -216,15 +216,7 @@ lib.makeScope newScope (self: rec { pcsx-rearmed = self.callPackage ./cores/pcsx-rearmed.nix { }; pcsx_rearmed = lib.lowPrio(self.pcsx-rearmed); # added 2024-11-20 - picodrive = mkLibretroCore { - core = "picodrive"; - dontConfigure = true; - meta = { - description = "Fast MegaDrive/MegaCD/32X emulator"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + picodrive = self.callPackage ./cores/picodrive.nix { }; play = mkLibretroCore { core = "play"; diff --git a/pkgs/applications/emulators/retroarch/cores/picodrive.nix b/pkgs/applications/emulators/retroarch/cores/picodrive.nix new file mode 100644 index 000000000000..6c5b6e093fe0 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/picodrive.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "picodrive"; + version = "unstable-2024-10-19"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "picodrive"; + rev = "0daf92b57fba1fdbc124651573e88373eef28aa5"; + hash = "sha256-rvgcGNpHhjHpg5q6qiu08lBn+Zjx87E5/Q98gPoffhE="; + fetchSubmodules = true; + }; + + dontConfigure = true; + + meta = { + description = "Fast MegaDrive/MegaCD/32X emulator"; + homepage = "https://github.com/libretro/picodrive"; + license = lib.licenses.unfreeRedistributable; + }; +} From 46ab30c61f7bf51f5b1446498684b78c4e21178f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:11:20 +0000 Subject: [PATCH 139/192] libretro.play: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 16 +----- .../emulators/retroarch/cores/play.nix | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/play.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index dfd2b2f76a06..41dc9c278ce3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -218,21 +218,7 @@ lib.makeScope newScope (self: rec { picodrive = self.callPackage ./cores/picodrive.nix { }; - play = mkLibretroCore { - core = "play"; - extraBuildInputs = [ boost bzip2 curl openssl icu libGL libGLU xorg.libX11 ]; - extraNativeBuildInputs = [ cmake ]; - makefile = "Makefile"; - cmakeFlags = [ "-DBUILD_PLAY=OFF" "-DBUILD_LIBRETRO_CORE=ON" ]; - postBuild = "cd Source/ui_libretro"; - # FIXME: workaround the following GCC 13 error: - # error: 'printf' was not declared in this scop - CXXFLAGS = "-include cstdio"; - meta = { - description = "Port of Play! to libretro"; - license = lib.licenses.bsd2; - }; - }; + play = self.callPackage ./cores/play.nix { }; ppsspp = mkLibretroCore { core = "ppsspp"; diff --git a/pkgs/applications/emulators/retroarch/cores/play.nix b/pkgs/applications/emulators/retroarch/cores/play.nix new file mode 100644 index 000000000000..12b3ac2d6ba6 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/play.nix @@ -0,0 +1,53 @@ +{ + lib, + boost, + bzip2, + cmake, + curl, + fetchFromGitHub, + icu, + libGL, + libGLU, + mkLibretroCore, + openssl, + xorg, +}: +mkLibretroCore { + core = "play"; + version = "unstable-2024-10-19"; + + src = fetchFromGitHub { + owner = "jpd002"; + repo = "Play-"; + rev = "c3cba5418b4e5618befd9c2790498cf3cf88372a"; + hash = "sha256-xO2Pgl1E0JFEsthTmG+Ka+NqOTWG/JeeAIa6wBWXJyc="; + fetchSubmodules = true; + }; + + extraBuildInputs = [ + boost + bzip2 + curl + openssl + icu + libGL + libGLU + xorg.libX11 + ]; + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DBUILD_PLAY=OFF" + "-DBUILD_LIBRETRO_CORE=ON" + ]; + postBuild = "cd Source/ui_libretro"; + # FIXME: workaround the following GCC 13 error: + # error: 'printf' was not declared in this scop + env.CXXFLAGS = "-include cstdio"; + + meta = { + description = "Port of Play! to libretro"; + homepage = "https://github.com/jpd002/Play-"; + license = lib.licenses.bsd2; + }; +} From 215e0d401257baf045fe9b08d6ba7bc0fc985fd8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:20:20 +0000 Subject: [PATCH 140/192] libretro.ppsspp: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 21 +------ .../emulators/retroarch/cores/ppsspp.nix | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/ppsspp.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 41dc9c278ce3..2fc6b82c5e65 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -220,26 +220,7 @@ lib.makeScope newScope (self: rec { play = self.callPackage ./cores/play.nix { }; - ppsspp = mkLibretroCore { - core = "ppsspp"; - extraNativeBuildInputs = [ cmake pkg-config python3 ]; - extraBuildInputs = [ libGLU libGL libzip snappy xorg.libX11 ]; - makefile = "Makefile"; - cmakeFlags = [ - "-DLIBRETRO=ON" - # USE_SYSTEM_FFMPEG=ON causes several glitches during video playback - # See: https://github.com/NixOS/nixpkgs/issues/304616 - "-DUSE_SYSTEM_FFMPEG=OFF" - "-DUSE_SYSTEM_SNAPPY=ON" - "-DUSE_SYSTEM_LIBZIP=ON" - "-DOpenGL_GL_PREFERENCE=GLVND" - ]; - postBuild = "cd lib"; - meta = { - description = "ppsspp libretro port"; - license = lib.licenses.gpl2Plus; - }; - }; + ppsspp = self.callPackage ./cores/ppsspp.nix { }; prboom = mkLibretroCore { core = "prboom"; diff --git a/pkgs/applications/emulators/retroarch/cores/ppsspp.nix b/pkgs/applications/emulators/retroarch/cores/ppsspp.nix new file mode 100644 index 000000000000..78db8a8db409 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/ppsspp.nix @@ -0,0 +1,55 @@ +{ + lib, + cmake, + fetchFromGitHub, + libGL, + libGLU, + libzip, + mkLibretroCore, + pkg-config, + python3, + snappy, + xorg, +}: +mkLibretroCore { + core = "ppsspp"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "2402eea4b16908ad59079bcf3fab06ba63531a3c"; + hash = "sha256-bpeiZdcXkGWLFZOsxTGuVmo4xAiUb9v5Wf6pWkt5JV0="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + extraBuildInputs = [ + libGLU + libGL + libzip + snappy + xorg.libX11 + ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DLIBRETRO=ON" + # USE_SYSTEM_FFMPEG=ON causes several glitches during video playback + # See: https://github.com/NixOS/nixpkgs/issues/304616 + "-DUSE_SYSTEM_FFMPEG=OFF" + "-DUSE_SYSTEM_SNAPPY=ON" + "-DUSE_SYSTEM_LIBZIP=ON" + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + postBuild = "cd lib"; + + meta = { + description = "PPSSPP libretro port"; + homepage = "https://github.com/hrydgard/ppsspp"; + license = lib.licenses.gpl2Plus; + }; +} From aa75a15f56b2f732b8b59f94d357e1e69d710fed Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:24:09 +0000 Subject: [PATCH 141/192] libretro.prboom: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/prboom.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/prboom.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 2fc6b82c5e65..95ec8eed6a79 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -222,14 +222,7 @@ lib.makeScope newScope (self: rec { ppsspp = self.callPackage ./cores/ppsspp.nix { }; - prboom = mkLibretroCore { - core = "prboom"; - makefile = "Makefile"; - meta = { - description = "Prboom libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + prboom = self.callPackage ./cores/prboom.nix { }; prosystem = mkLibretroCore { core = "prosystem"; diff --git a/pkgs/applications/emulators/retroarch/cores/prboom.nix b/pkgs/applications/emulators/retroarch/cores/prboom.nix new file mode 100644 index 000000000000..b92d3159d729 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/prboom.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "prboom"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-prboom"; + rev = "d25ccfb9739069824d8fff99e3ae78a58a09df01"; + hash = "sha256-IaMreS2MSkFdZ3Jff2FOZBvKIIa4KIkp41LIg3PLl44="; + }; + + makefile = "Makefile"; + + meta = { + description = "Prboom libretro port"; + homepage = "https://github.com/libretro/libretro-prboom"; + license = lib.licenses.gpl2Only; + }; +} From eb45df7d86baaeef2d52452c2c179544794c103f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:26:25 +0000 Subject: [PATCH 142/192] libretro.prosystem: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/prosystem.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/prosystem.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 95ec8eed6a79..171955eed008 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -224,14 +224,7 @@ lib.makeScope newScope (self: rec { prboom = self.callPackage ./cores/prboom.nix { }; - prosystem = mkLibretroCore { - core = "prosystem"; - makefile = "Makefile"; - meta = { - description = "Port of ProSystem to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + prosystem = self.callPackage ./cores/prosystem.nix { }; puae = mkLibretroCore { core = "puae"; diff --git a/pkgs/applications/emulators/retroarch/cores/prosystem.nix b/pkgs/applications/emulators/retroarch/cores/prosystem.nix new file mode 100644 index 000000000000..30aedcb7e346 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/prosystem.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "prosystem"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "prosystem-libretro"; + rev = "acae250da8d98b8b9707cd499e2a0bf6d8500652"; + hash = "sha256-AGF3K3meZEEsnzHmMTCsFXBGNvWVELH8a8qET07kP0o="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of ProSystem to libretro"; + homepage = "https://github.com/libretro/prosystem-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 9c4bcd0e97c88fa84554d471cdda2c08f00ddc33 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:32:32 +0000 Subject: [PATCH 143/192] libretro.puae: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/puae.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/puae.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 171955eed008..2b24e7963b58 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -226,14 +226,7 @@ lib.makeScope newScope (self: rec { prosystem = self.callPackage ./cores/prosystem.nix { }; - puae = mkLibretroCore { - core = "puae"; - makefile = "Makefile"; - meta = { - description = "Amiga emulator based on WinUAE"; - license = lib.licenses.gpl2Only; - }; - }; + puae = self.callPackage ./cores/puae.nix { }; quicknes = mkLibretroCore { core = "quicknes"; diff --git a/pkgs/applications/emulators/retroarch/cores/puae.nix b/pkgs/applications/emulators/retroarch/cores/puae.nix new file mode 100644 index 000000000000..9fe0184c36e0 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/puae.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "puae"; + version = "unstable-2024-10-19"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-uae"; + rev = "c60e42ef9ad474518d4be859b7c1da2c0c7e1d6f"; + hash = "sha256-WCkz7BUgYaI+yRhPmNuOKGJC/GxV+n2aeJVn8vhx0Ng="; + }; + + makefile = "Makefile"; + + meta = { + description = "Amiga emulator based on WinUAE"; + homepage = "https://github.com/libretro/libretro-uae"; + license = lib.licenses.gpl2Only; + }; +} From bdd38425123d157d9cfe5d926506d195bc53d2c3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:35:42 +0000 Subject: [PATCH 144/192] libretro.quicknes: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/quicknes.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/quicknes.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 2b24e7963b58..8229512e8a56 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -228,14 +228,7 @@ lib.makeScope newScope (self: rec { puae = self.callPackage ./cores/puae.nix { }; - quicknes = mkLibretroCore { - core = "quicknes"; - makefile = "Makefile"; - meta = { - description = "QuickNES libretro port"; - license = lib.licenses.lgpl21Plus; - }; - }; + quicknes = self.callPackage ./cores/quicknes.nix { }; sameboy = mkLibretroCore { core = "sameboy"; diff --git a/pkgs/applications/emulators/retroarch/cores/quicknes.nix b/pkgs/applications/emulators/retroarch/cores/quicknes.nix new file mode 100644 index 000000000000..18edd078af28 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/quicknes.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "quicknes"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "QuickNES_Core"; + rev = "dbf19f73e3eb9701d1c7f5898f57c097e05c9fbd"; + hash = "sha256-oFQUMp1imc8JCsQYCy1BtIUmTC+u0VcoYHpWzUpKNb4="; + }; + + makefile = "Makefile"; + + meta = { + description = "QuickNES libretro port"; + homepage = "https://github.com/libretro/QuickNES_Core"; + license = lib.licenses.lgpl21Plus; + }; +} From 5674d17def505b7ec06e116ab19ca2f778901f3f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:39:30 +0000 Subject: [PATCH 145/192] libretro.sameboy: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------ .../emulators/retroarch/cores/sameboy.nix | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/sameboy.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 8229512e8a56..c8cf4d96ecd4 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -230,16 +230,7 @@ lib.makeScope newScope (self: rec { quicknes = self.callPackage ./cores/quicknes.nix { }; - sameboy = mkLibretroCore { - core = "sameboy"; - extraNativeBuildInputs = [ which hexdump ]; - preBuild = "cd libretro"; - makefile = "Makefile"; - meta = { - description = "SameBoy libretro port"; - license = lib.licenses.mit; - }; - }; + sameboy = self.callPackage ./cores/sameboy.nix { }; same_cdi = mkLibretroCore { core = "same_cdi"; diff --git a/pkgs/applications/emulators/retroarch/cores/sameboy.nix b/pkgs/applications/emulators/retroarch/cores/sameboy.nix new file mode 100644 index 000000000000..53ffa7b2fe4b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/sameboy.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + hexdump, + mkLibretroCore, + which, +}: +mkLibretroCore { + core = "sameboy"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "sameboy"; + rev = "51433012a871a44555492273fd22f29867d12655"; + hash = "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw="; + }; + + extraNativeBuildInputs = [ + which + hexdump + ]; + preBuild = "cd libretro"; + makefile = "Makefile"; + + meta = { + description = "QuickNES libretro port"; + homepage = "https://github.com/libretro/QuickNES_Core"; + license = lib.licenses.mit; + }; +} From ba77247b37f615083cfa807852b3dd19aa878c90 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:44:46 +0000 Subject: [PATCH 146/192] libretro.same_cdi: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 15 +------ .../emulators/retroarch/cores/same_cdi.nix | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/same_cdi.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c8cf4d96ecd4..c0a09e891259 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -230,20 +230,9 @@ lib.makeScope newScope (self: rec { quicknes = self.callPackage ./cores/quicknes.nix { }; - sameboy = self.callPackage ./cores/sameboy.nix { }; + same_cdi = self.callPackage ./cores/same_cdi.nix { }; # the name is not a typo - same_cdi = mkLibretroCore { - core = "same_cdi"; - extraNativeBuildInputs = [ python3 ]; - extraBuildInputs = [ alsa-lib libGLU libGL portaudio xorg.libX11 ]; - # FIXME: build fail with GCC13: - # error: 'uint8_t' in namespace 'std' does not name a type; did you mean 'wint_t'? - stdenv = gcc12Stdenv; - meta = { - description = "SAME_CDI is a libretro core to play CD-i games"; - license = with lib.licenses; [ bsd3 gpl2Plus ]; - }; - }; + sameboy = self.callPackage ./cores/sameboy.nix { }; scummvm = mkLibretroCore { core = "scummvm"; diff --git a/pkgs/applications/emulators/retroarch/cores/same_cdi.nix b/pkgs/applications/emulators/retroarch/cores/same_cdi.nix new file mode 100644 index 000000000000..365b2c5cefc0 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/same_cdi.nix @@ -0,0 +1,44 @@ +{ + lib, + alsa-lib, + fetchFromGitHub, + gcc12Stdenv, + libGL, + libGLU, + mkLibretroCore, + portaudio, + python3, + xorg, +}: +mkLibretroCore { + core = "same_cdi"; + version = "unstable-2023-02-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "same_cdi"; + rev = "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0"; + hash = "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E="; + }; + + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ + alsa-lib + libGL + libGLU + portaudio + xorg.libX11 + ]; + # FIXME = build fail with GCC13: + # error = 'uint8_t' in namespace 'std' does not name a type; did you mean 'wint_t'? + stdenv = gcc12Stdenv; + + meta = { + description = "SAME_CDI is a libretro core to play CD-i games"; + homepage = "https://github.com/libretro/same_cdi"; + license = with lib.licenses; [ + bsd3 + gpl2Plus + ]; + }; +} From 9c470f7502c8d29531ff4a8664f7977a38dd1368 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:49:42 +0000 Subject: [PATCH 147/192] libretro.scumvmm: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +---- .../emulators/retroarch/cores/scummvm.nix | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/scummvm.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c0a09e891259..918cddf4582e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -234,16 +234,7 @@ lib.makeScope newScope (self: rec { sameboy = self.callPackage ./cores/sameboy.nix { }; - scummvm = mkLibretroCore { - core = "scummvm"; - extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ]; - makefile = "Makefile"; - preConfigure = "cd backends/platform/libretro/build"; - meta = { - description = "Libretro port of ScummVM"; - license = lib.licenses.gpl2Only; - }; - }; + scummvm = self.callPackage ./cores/scummvm.nix { }; smsplus-gx = mkLibretroCore { core = "smsplus"; diff --git a/pkgs/applications/emulators/retroarch/cores/scummvm.nix b/pkgs/applications/emulators/retroarch/cores/scummvm.nix new file mode 100644 index 000000000000..6b8cc313913c --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/scummvm.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + fluidsynth, + libGL, + libGLU, + libjpeg, + libvorbis, + mkLibretroCore, +}: +mkLibretroCore { + core = "scummvm"; + version = "unstable-2022-04-06"; + + # This is the old source code before they upstreamed the source code, + # so now the libretro related code lives in the scummvm/scummvm repository. + # However this broke the old way we were doing builds, so for now point + # to a mirror with the old source code until this issue is fixed. + # TODO: switch to libretro/scummvm since this is more up-to-date + src = fetchFromGitHub { + owner = "libretro-mirrors"; + repo = "scummvm"; + rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3"; + hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="; + }; + + extraBuildInputs = [ + fluidsynth + libjpeg + libvorbis + libGLU + libGL + ]; + makefile = "Makefile"; + preConfigure = "cd backends/platform/libretro/build"; + + meta = { + description = "Libretro port of ScummVM"; + homepage = "https://github.com/libretro-mirrors/scummvm"; + license = lib.licenses.gpl2Only; + }; +} From e07d0ce6f693ade3ad14a1300780906cafc8a990 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:56:08 +0000 Subject: [PATCH 148/192] libretro.smsplus-gx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------- .../emulators/retroarch/cores/smsplus-gx.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 918cddf4582e..1b396c396ddf 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -236,14 +236,7 @@ lib.makeScope newScope (self: rec { scummvm = self.callPackage ./cores/scummvm.nix { }; - smsplus-gx = mkLibretroCore { - core = "smsplus"; - repo = "smsplus-gx"; - meta = { - description = "SMS Plus GX libretro port"; - license = lib.licenses.gpl2Plus; - }; - }; + smsplus-gx = self.callPackage ./cores/smsplus-gx.nix { }; snes9x = mkLibretroCore { core = "snes9x"; diff --git a/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix b/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix new file mode 100644 index 000000000000..3eb69a857811 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "smsplus"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "smsplus-gx"; + rev = "c642bbd0680b5959180a420036108893d0aec961"; + hash = "sha256-SHBrwzLyVZ4Tp/kVCnr4xj2B3pmdg+JUmZUM7hYao64="; + }; + + meta = { + description = "SMS Plus GX libretro port"; + homepage = "https://github.com/libretro/smsplus-gx"; + license = lib.licenses.gpl2Plus; + }; +} From e96e989b265125664f55d70801bf0f122dde71c2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:26:31 +0000 Subject: [PATCH 149/192] libretro.snes9x: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/snes9x.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/snes9x.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 1b396c396ddf..182c9e8434cb 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -238,16 +238,7 @@ lib.makeScope newScope (self: rec { smsplus-gx = self.callPackage ./cores/smsplus-gx.nix { }; - snes9x = mkLibretroCore { - core = "snes9x"; - makefile = "Makefile"; - preBuild = "cd libretro"; - meta = { - description = "Port of SNES9x git to libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x = self.callPackage ./cores/snes9x.nix { }; snes9x2002 = mkLibretroCore { core = "snes9x2002"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x.nix b/pkgs/applications/emulators/retroarch/cores/snes9x.nix new file mode 100644 index 000000000000..dc51fdfc9d3b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/snes9x.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "snes9x"; + version = "unstable-2024-10-28"; + + src = fetchFromGitHub { + owner = "snes9xgit"; + repo = "snes9x"; + rev = "fd05ca7df5259a2cd0aa9204f331e0b05126c376"; + hash = "sha256-o/Rb1XQ7QoI0hKROMFZ9igyH8NN3bMryvyU4oNUqtRA="; + }; + + makefile = "Makefile"; + preBuild = "cd libretro"; + + meta = { + description = "Port of SNES9x git to libretro"; + homepage = "https://github.com/snes9xgit/snes9x"; + license = lib.licenses.unfreeRedistributable; + }; +} From 6ea1c0b4142dd1023cb6e48edd86b2191133b487 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:28:42 +0000 Subject: [PATCH 150/192] libretro.snes9x2002: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/snes9x2002.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/snes9x2002.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 182c9e8434cb..dbd48ba6c229 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -240,15 +240,7 @@ lib.makeScope newScope (self: rec { snes9x = self.callPackage ./cores/snes9x.nix { }; - snes9x2002 = mkLibretroCore { - core = "snes9x2002"; - makefile = "Makefile"; - meta = { - description = "Optimized port/rewrite of SNES9x 1.39 to Libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x2002 = self.callPackage ./cores/snes9x2002.nix { }; snes9x2005 = mkLibretroCore { core = "snes9x2005"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix new file mode 100644 index 000000000000..f64f31641b56 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "snes9x2002"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "snes9x2002"; + rev = "a0709ec7dcd6de2fbebb43106bd757b649e3b7cf"; + hash = "sha256-rrMPhXIsQ48fVvjgZgC3xeqm9k9kwe43oZNzs2d/h1Q="; + }; + + makefile = "Makefile"; + + meta = { + description = "Optimized port/rewrite of SNES9x 1.39 to Libretro"; + homepage = "https://github.com/libretro/snes9x2002"; + license = lib.licenses.unfreeRedistributable; + }; +} From 933b4db84b5af171819d9df6f3b68863fa5b7a80 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:31:14 +0000 Subject: [PATCH 151/192] libretro.snes9x2005{,-plus}: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 22 ++-------------- .../emulators/retroarch/cores/snes9x2005.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/snes9x2005.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index dbd48ba6c229..94e992b46776 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -242,27 +242,9 @@ lib.makeScope newScope (self: rec { snes9x2002 = self.callPackage ./cores/snes9x2002.nix { }; - snes9x2005 = mkLibretroCore { - core = "snes9x2005"; - makefile = "Makefile"; - meta = { - description = "Optimized port/rewrite of SNES9x 1.43 to Libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x2005 = self.callPackage ./cores/snes9x2005.nix { }; - snes9x2005-plus = mkLibretroCore { - core = "snes9x2005-plus"; - repo = "snes9x2005"; - makefile = "Makefile"; - makeFlags = [ "USE_BLARGG_APU=1" ]; - meta = { - description = "Optimized port/rewrite of SNES9x 1.43 to Libretro, with Blargg's APU"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x2005-plus = self.snes9x2005.override { withBlarggAPU = true; }; snes9x2010 = mkLibretroCore { core = "snes9x2010"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix new file mode 100644 index 000000000000..f823a0fab39a --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + withBlarggAPU ? false, +}: +mkLibretroCore { + core = "snes9x2005" + lib.optionalString withBlarggAPU "-plus"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "snes9x2005"; + rev = "74d871db9b4dba6dbe6c5ecebc88cbf255be5349"; + hash = "sha256-YlRMjSEo9sdLVRzWGSJlnBeqg6wUhZi8l3ffzUaKQIQ="; + }; + + makefile = "Makefile"; + makeFlags = lib.optionals withBlarggAPU [ "USE_BLARGG_APU=1" ]; + + meta = { + description = "Optimized port/rewrite of SNES9x 1.43 to Libretro"; + homepage = "https://github.com/libretro/snes9x2005"; + license = lib.licenses.unfreeRedistributable; + }; +} From 5819c9c742a81aebedbbd8c16f5e27e47f2873fa Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:46:37 +0000 Subject: [PATCH 152/192] libretro.snes9x2010: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/snes9x2010.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/snes9x2010.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 94e992b46776..e88262b29a25 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -246,14 +246,7 @@ lib.makeScope newScope (self: rec { snes9x2005-plus = self.snes9x2005.override { withBlarggAPU = true; }; - snes9x2010 = mkLibretroCore { - core = "snes9x2010"; - meta = { - description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x2010 = self.callPackage ./cores/snes9x2010.nix { }; stella = mkLibretroCore { core = "stella"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix new file mode 100644 index 000000000000..8b913e7fa4a4 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore rec { + core = "snes9x2010"; + version = "unstable-2024-11-18"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "snes9x2010"; + rev = "f9ae8fd28b13070a945a829ccf41cbf90a21d0f7"; + hash = "sha256-nsExAYnzDenPvXzeN60jGykRTrCGMi/mRPV+vgS8ZtE="; + }; + + makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; + + meta = { + description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; + homepage = "https://github.com/libretro/snes9x2010"; + license = lib.licenses.unfreeRedistributable; + }; +} From 5d49f432a20a89094edd88778ee48fd937a59df9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:51:52 +0000 Subject: [PATCH 153/192] libretro/stella: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/stella.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/stella.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e88262b29a25..f4b238f4c0bb 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -248,16 +248,7 @@ lib.makeScope newScope (self: rec { snes9x2010 = self.callPackage ./cores/snes9x2010.nix { }; - stella = mkLibretroCore { - core = "stella"; - makefile = "Makefile"; - preBuild = "cd src/os/libretro"; - dontConfigure = true; - meta = { - description = "Port of Stella to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + stella = self.callPackage ./cores/stella.nix { }; stella2014 = mkLibretroCore { core = "stella2014"; diff --git a/pkgs/applications/emulators/retroarch/cores/stella.nix b/pkgs/applications/emulators/retroarch/cores/stella.nix new file mode 100644 index 000000000000..891127b278fa --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/stella.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "stella"; + version = "unstable-2024-11-17"; + + src = fetchFromGitHub { + owner = "stella-emu"; + repo = "stella"; + rev = "0e2ce2771c7d0c9b2dd5c06e3a4746738d3c9e47"; + hash = "sha256-axt5wvH7WENh1ALPYc+f5XpCv2xPm5jYx26zMhLEt3E="; + }; + + makefile = "Makefile"; + preBuild = "cd src/os/libretro"; + dontConfigure = true; + + meta = { + description = "Port of Stella to libretro"; + homepage = "https://github.com/stella-emu/stella"; + license = lib.licenses.gpl2Only; + }; +} From 0d5079de2d817160e21f56056227daf681cc8a58 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:54:44 +0000 Subject: [PATCH 154/192] libretro.stella2014: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/stella2014.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/stella2014.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index f4b238f4c0bb..87643c0d3451 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -250,14 +250,7 @@ lib.makeScope newScope (self: rec { stella = self.callPackage ./cores/stella.nix { }; - stella2014 = mkLibretroCore { - core = "stella2014"; - makefile = "Makefile"; - meta = { - description = "Port of Stella ~2014 to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + stella2014 = self.callPackage ./cores/stella2014.nix { }; swanstation = mkLibretroCore { core = "swanstation"; diff --git a/pkgs/applications/emulators/retroarch/cores/stella2014.nix b/pkgs/applications/emulators/retroarch/cores/stella2014.nix new file mode 100644 index 000000000000..2baf66a65f7b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/stella2014.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "stella2014"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "stella2014-libretro"; + rev = "3cc89f0d316d6c924a5e3f4011d17421df58e615"; + hash = "sha256-2gnFWau7F45SdzoqDUlqYXfXVE1EUPozHZv7BhyRRIA="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Stella ~2014 to libretro"; + homepage = "https://github.com/libretro/stella2014-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 35a15946800b19ee36acb3b94a4f186f41f83467 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:57:04 +0000 Subject: [PATCH 155/192] libretro.swanstation: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 13 +-------- .../emulators/retroarch/cores/swanstation.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/swanstation.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 87643c0d3451..51c22146d160 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -252,18 +252,7 @@ lib.makeScope newScope (self: rec { stella2014 = self.callPackage ./cores/stella2014.nix { }; - swanstation = mkLibretroCore { - core = "swanstation"; - extraNativeBuildInputs = [ cmake ]; - makefile = "Makefile"; - cmakeFlags = [ - "-DBUILD_LIBRETRO_CORE=ON" - ]; - meta = { - description = "Port of SwanStation (a fork of DuckStation) to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + swanstation = self.callPackage ./cores/swanstation.nix { }; tgbdual = mkLibretroCore { core = "tgbdual"; diff --git a/pkgs/applications/emulators/retroarch/cores/swanstation.nix b/pkgs/applications/emulators/retroarch/cores/swanstation.nix new file mode 100644 index 000000000000..aa87dc8178b1 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/swanstation.nix @@ -0,0 +1,29 @@ +{ + lib, + cmake, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "swanstation"; + version = "unstable-2024-07-24"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "swanstation"; + rev = "37cd87e14ca09ac1b558e5b2c7db4ad256865bbb"; + hash = "sha256-dNIxlTPoY4S6VMtTN22ti3DE4aU/8XN/XhAo3DMNR/E="; + }; + + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DBUILD_LIBRETRO_CORE=ON" + ]; + + meta = { + description = "Port of SwanStation (a fork of DuckStation) to libretro"; + homepage = "https://github.com/libretro/swanstation"; + license = lib.licenses.gpl3Only; + }; +} From dce5b44ed781122a8fcbee2620b6434bd376c53a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:59:38 +0000 Subject: [PATCH 156/192] libretro.tgbdual: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/tgbdual.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/tgbdual.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 51c22146d160..75258a75c789 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -254,14 +254,7 @@ lib.makeScope newScope (self: rec { swanstation = self.callPackage ./cores/swanstation.nix { }; - tgbdual = mkLibretroCore { - core = "tgbdual"; - makefile = "Makefile"; - meta = { - description = "Port of TGBDual to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + tgbdual = self.callPackage ./cores/tgbdual.nix { }; thepowdertoy = mkLibretroCore { core = "thepowdertoy"; diff --git a/pkgs/applications/emulators/retroarch/cores/tgbdual.nix b/pkgs/applications/emulators/retroarch/cores/tgbdual.nix new file mode 100644 index 000000000000..7297818539c8 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/tgbdual.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "tgbdual"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "tgbdual-libretro"; + rev = "8d305769eebd67266c284558f9d3a30498894d3d"; + hash = "sha256-3mlnTgp43qC3yifpr6pvtC4vslddcf6mephKA183vEk="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of TGBDual to libretro"; + homepage = "https://github.com/libretro/tgbdual-libretro"; + license = lib.licenses.gpl2Only; + }; +} From dec2549c0c2706d21eff7c9e169dfec444b31f29 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:02:00 +0000 Subject: [PATCH 157/192] libretro.thepowdertoy: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../retroarch/cores/thepowdertoy.nix | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 75258a75c789..4d74950466b7 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -256,16 +256,7 @@ lib.makeScope newScope (self: rec { tgbdual = self.callPackage ./cores/tgbdual.nix { }; - thepowdertoy = mkLibretroCore { - core = "thepowdertoy"; - extraNativeBuildInputs = [ cmake ]; - makefile = "Makefile"; - postBuild = "cd src"; - meta = { - description = "Port of The Powder Toy to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + thepowdertoy = self.callPackage ./cores/thepowdertoy.nix { }; tic80 = mkLibretroCore { core = "tic80"; diff --git a/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix b/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix new file mode 100644 index 000000000000..2b8358a59803 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix @@ -0,0 +1,27 @@ +{ + lib, + cmake, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "thepowdertoy"; + version = "unstable-2024-10-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "ThePowderToy"; + rev = "5d9c749780063b87bd62ddb025dee4241f196f26"; + hash = "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8="; + }; + + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + postBuild = "cd src"; + + meta = { + description = "Port of The Powder Toy to libretro"; + homepage = "https://github.com/libretro/ThePowderToy"; + license = lib.licenses.gpl3Only; + }; +} From 0ea40e12d79db9aed77f81de0041ad6ccb429180 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:04:35 +0000 Subject: [PATCH 158/192] libretro.tic80: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 20 +-------- .../emulators/retroarch/cores/tic80.nix | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/tic80.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 4d74950466b7..c20c529aba84 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -258,25 +258,7 @@ lib.makeScope newScope (self: rec { thepowdertoy = self.callPackage ./cores/thepowdertoy.nix { }; - tic80 = mkLibretroCore { - core = "tic80"; - extraNativeBuildInputs = [ cmake pkg-config ]; - makefile = "Makefile"; - cmakeFlags = [ - "-DBUILD_LIBRETRO=ON" - "-DBUILD_DEMO_CARTS=OFF" - "-DBUILD_PRO=OFF" - "-DBUILD_PLAYER=OFF" - "-DBUILD_SDL=OFF" - "-DBUILD_SOKOL=OFF" - ]; - preConfigure = "cd core"; - postBuild = "cd lib"; - meta = { - description = "Port of TIC-80 to libretro"; - license = lib.licenses.mit; - }; - }; + tic80 = self.callPackage ./cores/tic80.nix { }; twenty-fortyeight = mkLibretroCore { core = "2048"; diff --git a/pkgs/applications/emulators/retroarch/cores/tic80.nix b/pkgs/applications/emulators/retroarch/cores/tic80.nix new file mode 100644 index 000000000000..2e637e9a1e74 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/tic80.nix @@ -0,0 +1,41 @@ +{ + lib, + cmake, + fetchFromGitHub, + mkLibretroCore, + pkg-config, +}: +mkLibretroCore { + core = "tic80"; + version = "unstable-2024-05-13"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "tic-80"; + rev = "6412f72d0f4725c153ce3d245729b829e713542e"; + hash = "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ + cmake + pkg-config + ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DBUILD_LIBRETRO=ON" + "-DBUILD_DEMO_CARTS=OFF" + "-DBUILD_PRO=OFF" + "-DBUILD_PLAYER=OFF" + "-DBUILD_SDL=OFF" + "-DBUILD_SOKOL=OFF" + ]; + preConfigure = "cd core"; + postBuild = "cd lib"; + + meta = { + description = "Port of TIC-80 to libretro"; + homepage = "https://github.com/libretro/tic-80"; + license = lib.licenses.mit; + }; +} From 9455b06a10aac04d94b5c4da276a7526a150e0fc Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:07:56 +0000 Subject: [PATCH 159/192] libretro.twenty-fortyeight: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../retroarch/cores/twenty-fortyeight.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c20c529aba84..37b197e3bf2e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -260,13 +260,7 @@ lib.makeScope newScope (self: rec { tic80 = self.callPackage ./cores/tic80.nix { }; - twenty-fortyeight = mkLibretroCore { - core = "2048"; - meta = { - description = "Port of 2048 puzzle game to the libretro API"; - license = lib.licenses.unlicense; - }; - }; + twenty-fortyeight = self.callPackage ./cores/twenty-fortyeight.nix { }; vba-m = mkLibretroCore { core = "vbam"; diff --git a/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix b/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix new file mode 100644 index 000000000000..23d72dfead1b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "2048"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-2048"; + rev = "5474ed1ab880b3296c9860d0943d7de1970c79dd"; + hash = "sha256-i6bbxsLpSicDDGYKAxTMCMioHHfvBzVokun3PNYgDsc="; + }; + + meta = { + description = "Port of 2048 puzzle game to libretro"; + homepage = "https://github.com/libretro/libretro-2048"; + license = lib.licenses.unlicense; + }; +} From 55c673765c27ee35c4747c007023fd3f8450b031 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:11:08 +0000 Subject: [PATCH 160/192] libretro.vba-m: move to retroarch/cores --- .../emulators/retroarch/cores/vba-m.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/applications/emulators/retroarch/cores/vba-m.nix diff --git a/pkgs/applications/emulators/retroarch/cores/vba-m.nix b/pkgs/applications/emulators/retroarch/cores/vba-m.nix new file mode 100644 index 000000000000..5b50f4d9a094 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/vba-m.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "vbam"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "vbam-libretro"; + rev = "379dd97301458a51fb69dd93ba21b64f81e01ef2"; + hash = "sha256-UbXSHdKfa91MpcYityo+aILbI0DfkLqZh8YfGcRx/BI="; + }; + + makefile = "Makefile"; + preBuild = "cd src/libretro"; + + meta = { + description = "VBA-M libretro port"; + homepage = "https://github.com/libretro/vbam-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 52d42220c35994fe8d35198228977ae3458c68e4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:12:57 +0000 Subject: [PATCH 161/192] libretro.vba-next: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 19 ++-------------- .../emulators/retroarch/cores/vba-next.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/vba-next.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 37b197e3bf2e..493c2b47056f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -262,24 +262,9 @@ lib.makeScope newScope (self: rec { twenty-fortyeight = self.callPackage ./cores/twenty-fortyeight.nix { }; - vba-m = mkLibretroCore { - core = "vbam"; - repo = "vba-m"; - makefile = "Makefile"; - preBuild = "cd src/libretro"; - meta = { - description = "vanilla VBA-M libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + vba-m = self.callPackage ./cores/vba-m.nix { }; - vba-next = mkLibretroCore { - core = "vba-next"; - meta = { - description = "VBA-M libretro port with modifications for speed"; - license = lib.licenses.gpl2Only; - }; - }; + vba-next = self.callPackage ./cores/vba-next.nix { }; vecx = mkLibretroCore { core = "vecx"; diff --git a/pkgs/applications/emulators/retroarch/cores/vba-next.nix b/pkgs/applications/emulators/retroarch/cores/vba-next.nix new file mode 100644 index 000000000000..9027d8501565 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/vba-next.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "vba-next"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "vba-next"; + rev = "2c726f25da75a5600ef5791ce904befe06c4dddd"; + hash = "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs="; + }; + + meta = { + description = "VBA-M libretro port with modifications for speed"; + homepage = "https://github.com/libretro/vba-next"; + license = lib.licenses.gpl2Only; + }; +} From 0c15ac65d46b3a10fa66ab1a353657316ab2fc35 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:14:58 +0000 Subject: [PATCH 162/192] libretro.vecx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +----- .../emulators/retroarch/cores/vecx.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/vecx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 493c2b47056f..8c4028f586d5 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -266,14 +266,7 @@ lib.makeScope newScope (self: rec { vba-next = self.callPackage ./cores/vba-next.nix { }; - vecx = mkLibretroCore { - core = "vecx"; - extraBuildInputs = [ libGL libGLU ]; - meta = { - description = "Port of Vecx to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + vecx = self.callPackage ./cores/vecx.nix { }; virtualjaguar = mkLibretroCore { core = "virtualjaguar"; diff --git a/pkgs/applications/emulators/retroarch/cores/vecx.nix b/pkgs/applications/emulators/retroarch/cores/vecx.nix new file mode 100644 index 000000000000..664f01b73849 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/vecx.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + libGL, + libGLU, + mkLibretroCore, +}: +mkLibretroCore { + core = "vecx"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-vecx"; + rev = "0e48a8903bd9cc359da3f7db783f83e22722c0cf"; + hash = "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU="; + }; + + extraBuildInputs = [ + libGL + libGLU + ]; + + meta = { + description = "VBA-M libretro port with modifications for speed"; + homepage = "https://github.com/libretro/libretro-vecx"; + license = lib.licenses.gpl3Only; + }; +} From a994304cda565949ebe63ef779b29aa72e2a8ddb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:17:16 +0000 Subject: [PATCH 163/192] libretro.virtualjaguar: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../retroarch/cores/virtualjaguar.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 8c4028f586d5..199939aa498f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -268,14 +268,7 @@ lib.makeScope newScope (self: rec { vecx = self.callPackage ./cores/vecx.nix { }; - virtualjaguar = mkLibretroCore { - core = "virtualjaguar"; - makefile = "Makefile"; - meta = { - description = "Port of VirtualJaguar to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { }; yabause = mkLibretroCore { core = "yabause"; diff --git a/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix b/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix new file mode 100644 index 000000000000..c90c4b081002 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "virtualjaguar"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "virtualjaguar-libretro"; + rev = "48096c1f6f8b98cfff048a5cb4e6a86686631072"; + hash = "sha256-DLBQQARHqupGGQS8YznDSSMuxQliyt5apGA4Ku2jlYo="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of VirtualJaguar to libretro"; + homepage = "https://github.com/libretro/virtualjaguar-libretro"; + license = lib.licenses.gpl3Only; + }; +} From b57fd97854c24f559085feda787dd1ce80c99605 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:19:23 +0000 Subject: [PATCH 164/192] libretro.yabause: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +------- .../emulators/retroarch/cores/yabause.nix | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/yabause.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 199939aa498f..ebfc283d2360 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -270,15 +270,5 @@ lib.makeScope newScope (self: rec { virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { }; - yabause = mkLibretroCore { - core = "yabause"; - makefile = "Makefile"; - # Disable SSE for non-x86. DYNAREC doesn't build on aarch64. - makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; - preBuild = "cd yabause/src/libretro"; - meta = { - description = "Port of Yabause to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + yabause = self.callPackage ./cores/yabause.nix { }; }) diff --git a/pkgs/applications/emulators/retroarch/cores/yabause.nix b/pkgs/applications/emulators/retroarch/cores/yabause.nix new file mode 100644 index 000000000000..dec1fe3e89b9 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/yabause.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "yabause"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "yabause"; + rev = "c35712c5ed33e18d77097f2059a036e19d1d66f2"; + hash = "sha256-4/gxWNPkGKBf4ti7ZF4GXgng6ZPyM9prrvK0S5tZ6V8="; + }; + + makefile = "Makefile"; + # Disable SSE for non-x86. DYNAREC doesn't build on aarch64. + makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; + preBuild = "cd yabause/src/libretro"; + + meta = { + description = "Port of Yabause to libretro"; + homepage = "https://github.com/libretro/yabause"; + license = lib.licenses.gpl2Only; + }; +} From d8c5c5e001a00ca80e9be849be72bdde58f4daf8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:28:23 +0000 Subject: [PATCH 165/192] libretro.cores: clean-up, remove update_cores.py script --- maintainers/team-list.nix | 1 + .../emulators/retroarch/cores.nix | 234 ++--- .../emulators/retroarch/cores/beetle-gba.nix | 4 - .../emulators/retroarch/hashes.json | 903 ------------------ .../emulators/retroarch/mkLibretroCore.nix | 129 +-- .../emulators/retroarch/update_cores.py | 233 ----- 6 files changed, 151 insertions(+), 1353 deletions(-) delete mode 100644 pkgs/applications/emulators/retroarch/hashes.json delete mode 100755 pkgs/applications/emulators/retroarch/update_cores.py diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 613d6be6753a..c27a307a8261 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -576,6 +576,7 @@ with lib.maintainers; members = [ aanderse edwtjo + hrdinka thiagokokada ]; scope = "Maintain Libretro, RetroArch and related packages."; diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ebfc283d2360..61097042e33f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -1,89 +1,11 @@ -{ lib -, newScope -, stdenv -, gcc12Stdenv -, alsa-lib -, boost -, bzip2 -, cmake -, curl -, fetchFromGitHub -, fetchpatch -, ffmpeg_6 -, fluidsynth -, fmt -, freetype -, gettext -, harfbuzz -, hexdump -, hidapi -, icu -, libaio -, libevdev -, libGL -, libGLU -, libjpeg -, liblcf -, libpcap -, libpng -, libsndfile -, libvorbis -, libxml2 -, libxmp -, libzip -, mpg123 -, nasm -, openssl -, opusfile -, pcre -, pixman -, pkg-config -, portaudio -, python3 -, sfml -, snappy -, speexdsp -, udev -, which -, xorg -, xxd -, xz +{ + lib, + newScope, + fetchFromGitHub, }: -let - hashesFile = lib.importJSON ./hashes.json; - - getCore = repo: (lib.getAttr repo hashesFile); - - getCoreSrc = repo: - let - inherit (getCore repo) src fetcher; - fetcherFn = { - inherit fetchFromGitHub; - }.${fetcher} or (throw "Unknown fetcher: ${fetcher}"); - in - fetcherFn src; - - getCoreVersion = repo: (getCore repo).version; -in -lib.makeScope newScope (self: rec { - mkLibretroCore = - # Sometimes core name != repo name, so you may need to set them differently - # when necessary: - # - core: used by the resulting core library name, e.g.: - # `${core}_libretro.so`. Needs to match their respectful core info file - # (see https://github.com/libretro/libretro-core-info/) - # - repo: the repository name on GitHub - # See `update_cores.py` for instruction on how to add a new core. - { core - , repo ? core - , src ? (getCoreSrc repo) - , version ? (getCoreVersion repo) - , ... - }@args: - self.callPackage ./mkLibretroCore.nix ({ - inherit core repo src version; - } // args); +lib.makeScope newScope (self: { + mkLibretroCore = self.callPackage ./mkLibretroCore.nix; atari800 = self.callPackage ./cores/atari800.nix { }; @@ -127,148 +49,148 @@ lib.makeScope newScope (self: rec { bsnes-mercury-performance = self.bsnes-mercury.override { withProfile = "performance"; }; - citra = self.callPackage ./cores/citra.nix { }; + citra = self.callPackage ./cores/citra.nix { }; - desmume = self.callPackage ./cores/desmume.nix { }; + desmume = self.callPackage ./cores/desmume.nix { }; - desmume2015 = self.callPackage ./cores/desmume2015.nix { }; + desmume2015 = self.callPackage ./cores/desmume2015.nix { }; - dolphin = self.callPackage ./cores/dolphin.nix { }; + dolphin = self.callPackage ./cores/dolphin.nix { }; - dosbox = self.callPackage ./cores/dosbox.nix { }; + dosbox = self.callPackage ./cores/dosbox.nix { }; - dosbox-pure = self.callPackage ./cores/dosbox-pure.nix { }; + dosbox-pure = self.callPackage ./cores/dosbox-pure.nix { }; - easyrpg = self.callPackage ./cores/easyrpg.nix { }; + easyrpg = self.callPackage ./cores/easyrpg.nix { }; - eightyone = self.callPackage ./cores/eightyone.nix { }; + eightyone = self.callPackage ./cores/eightyone.nix { }; - fbalpha2012 = self.callPackage ./cores/fbalpha2012.nix { }; + fbalpha2012 = self.callPackage ./cores/fbalpha2012.nix { }; - fbneo = self.callPackage ./cores/fbneo.nix { }; + fbneo = self.callPackage ./cores/fbneo.nix { }; - fceumm = self.callPackage ./cores/fceumm.nix { }; + fceumm = self.callPackage ./cores/fceumm.nix { }; - flycast = self.callPackage ./cores/flycast.nix { }; + flycast = self.callPackage ./cores/flycast.nix { }; - fmsx = self.callPackage ./cores/fmsx.nix { }; + fmsx = self.callPackage ./cores/fmsx.nix { }; - freeintv = self.callPackage ./cores/freeintv.nix { }; + freeintv = self.callPackage ./cores/freeintv.nix { }; - fuse = self.callPackage ./cores/fuse.nix { }; + fuse = self.callPackage ./cores/fuse.nix { }; - gambatte = self.callPackage ./cores/gambatte.nix { }; + gambatte = self.callPackage ./cores/gambatte.nix { }; - genesis-plus-gx = self.callPackage ./cores/genesis-plus-gx.nix { }; + genesis-plus-gx = self.callPackage ./cores/genesis-plus-gx.nix { }; - gpsp = self.callPackage ./cores/gpsp.nix { }; + gpsp = self.callPackage ./cores/gpsp.nix { }; - gw = self.callPackage ./cores/gw.nix { }; + gw = self.callPackage ./cores/gw.nix { }; - handy = self.callPackage ./cores/handy.nix { }; + handy = self.callPackage ./cores/handy.nix { }; - hatari = self.callPackage ./cores/hatari.nix { }; + hatari = self.callPackage ./cores/hatari.nix { }; - mame = self.callPackage ./cores/mame.nix { }; + mame = self.callPackage ./cores/mame.nix { }; - mame2000 = self.callPackage ./cores/mame2000.nix { }; + mame2000 = self.callPackage ./cores/mame2000.nix { }; - mame2003 = self.callPackage ./cores/mame2003.nix { }; + mame2003 = self.callPackage ./cores/mame2003.nix { }; - mame2003-plus = self.callPackage ./cores/mame2003-plus.nix { }; + mame2003-plus = self.callPackage ./cores/mame2003-plus.nix { }; - mame2010 = self.callPackage ./cores/mame2010.nix { }; + mame2010 = self.callPackage ./cores/mame2010.nix { }; - mame2015 = self.callPackage ./cores/mame2015.nix { }; + mame2015 = self.callPackage ./cores/mame2015.nix { }; - mame2016 = self.callPackage ./cores/mame2016.nix { }; + mame2016 = self.callPackage ./cores/mame2016.nix { }; - melonds = self.callPackage ./cores/melonds.nix { }; + melonds = self.callPackage ./cores/melonds.nix { }; - mesen = self.callPackage ./cores/mesen.nix { }; + mesen = self.callPackage ./cores/mesen.nix { }; - mesen-s = self.callPackage ./cores/mesen-s.nix { }; + mesen-s = self.callPackage ./cores/mesen-s.nix { }; - meteor = self.callPackage ./cores/meteor.nix { }; + meteor = self.callPackage ./cores/meteor.nix { }; - mgba = self.callPackage ./cores/mgba.nix { }; + mgba = self.callPackage ./cores/mgba.nix { }; - mrboom = self.callPackage ./cores/mrboom.nix { }; + mrboom = self.callPackage ./cores/mrboom.nix { }; - mupen64plus = self.callPackage ./cores/mupen64plus.nix { }; + mupen64plus = self.callPackage ./cores/mupen64plus.nix { }; - neocd = self.callPackage ./cores/neocd.nix { }; + neocd = self.callPackage ./cores/neocd.nix { }; - nestopia = self.callPackage ./cores/nestopia.nix { }; + nestopia = self.callPackage ./cores/nestopia.nix { }; - np2kai = self.callPackage ./cores/np2kai.nix { }; + np2kai = self.callPackage ./cores/np2kai.nix { }; - nxengine = self.callPackage ./cores/nxengine.nix { }; + nxengine = self.callPackage ./cores/nxengine.nix { }; - o2em = self.callPackage ./cores/o2em.nix { }; + o2em = self.callPackage ./cores/o2em.nix { }; - opera = self.callPackage ./cores/opera.nix { }; + opera = self.callPackage ./cores/opera.nix { }; - parallel-n64 = self.callPackage ./cores/parallel-n64.nix { }; + parallel-n64 = self.callPackage ./cores/parallel-n64.nix { }; - pcsx2 = self.callPackage ./cores/pcsx2.nix { }; + pcsx2 = self.callPackage ./cores/pcsx2.nix { }; - pcsx-rearmed = self.callPackage ./cores/pcsx-rearmed.nix { }; - pcsx_rearmed = lib.lowPrio(self.pcsx-rearmed); # added 2024-11-20 + pcsx-rearmed = self.callPackage ./cores/pcsx-rearmed.nix { }; + pcsx_rearmed = lib.lowPrio (self.pcsx-rearmed); # added 2024-11-20 - picodrive = self.callPackage ./cores/picodrive.nix { }; + picodrive = self.callPackage ./cores/picodrive.nix { }; - play = self.callPackage ./cores/play.nix { }; + play = self.callPackage ./cores/play.nix { }; - ppsspp = self.callPackage ./cores/ppsspp.nix { }; + ppsspp = self.callPackage ./cores/ppsspp.nix { }; - prboom = self.callPackage ./cores/prboom.nix { }; + prboom = self.callPackage ./cores/prboom.nix { }; - prosystem = self.callPackage ./cores/prosystem.nix { }; + prosystem = self.callPackage ./cores/prosystem.nix { }; - puae = self.callPackage ./cores/puae.nix { }; + puae = self.callPackage ./cores/puae.nix { }; - quicknes = self.callPackage ./cores/quicknes.nix { }; + quicknes = self.callPackage ./cores/quicknes.nix { }; - same_cdi = self.callPackage ./cores/same_cdi.nix { }; # the name is not a typo + same_cdi = self.callPackage ./cores/same_cdi.nix { }; # the name is not a typo - sameboy = self.callPackage ./cores/sameboy.nix { }; + sameboy = self.callPackage ./cores/sameboy.nix { }; - scummvm = self.callPackage ./cores/scummvm.nix { }; + scummvm = self.callPackage ./cores/scummvm.nix { }; - smsplus-gx = self.callPackage ./cores/smsplus-gx.nix { }; + smsplus-gx = self.callPackage ./cores/smsplus-gx.nix { }; - snes9x = self.callPackage ./cores/snes9x.nix { }; + snes9x = self.callPackage ./cores/snes9x.nix { }; - snes9x2002 = self.callPackage ./cores/snes9x2002.nix { }; + snes9x2002 = self.callPackage ./cores/snes9x2002.nix { }; - snes9x2005 = self.callPackage ./cores/snes9x2005.nix { }; + snes9x2005 = self.callPackage ./cores/snes9x2005.nix { }; snes9x2005-plus = self.snes9x2005.override { withBlarggAPU = true; }; - snes9x2010 = self.callPackage ./cores/snes9x2010.nix { }; + snes9x2010 = self.callPackage ./cores/snes9x2010.nix { }; - stella = self.callPackage ./cores/stella.nix { }; + stella = self.callPackage ./cores/stella.nix { }; - stella2014 = self.callPackage ./cores/stella2014.nix { }; + stella2014 = self.callPackage ./cores/stella2014.nix { }; - swanstation = self.callPackage ./cores/swanstation.nix { }; + swanstation = self.callPackage ./cores/swanstation.nix { }; - tgbdual = self.callPackage ./cores/tgbdual.nix { }; + tgbdual = self.callPackage ./cores/tgbdual.nix { }; - thepowdertoy = self.callPackage ./cores/thepowdertoy.nix { }; + thepowdertoy = self.callPackage ./cores/thepowdertoy.nix { }; - tic80 = self.callPackage ./cores/tic80.nix { }; + tic80 = self.callPackage ./cores/tic80.nix { }; - twenty-fortyeight = self.callPackage ./cores/twenty-fortyeight.nix { }; + twenty-fortyeight = self.callPackage ./cores/twenty-fortyeight.nix { }; - vba-m = self.callPackage ./cores/vba-m.nix { }; + vba-m = self.callPackage ./cores/vba-m.nix { }; - vba-next = self.callPackage ./cores/vba-next.nix { }; + vba-next = self.callPackage ./cores/vba-next.nix { }; - vecx = self.callPackage ./cores/vecx.nix { }; + vecx = self.callPackage ./cores/vecx.nix { }; - virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { }; + virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { }; - yabause = self.callPackage ./cores/yabause.nix { }; + yabause = self.callPackage ./cores/yabause.nix { }; }) diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix b/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix index 22ce05982d23..ba6f74a5a6a0 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - unstableGitUpdater, mkLibretroCore, }: mkLibretroCore { @@ -17,9 +16,6 @@ mkLibretroCore { makefile = "Makefile"; - # TODO: move this to mkLibretroCore - passthru.updateScript = unstableGitUpdater { }; - meta = { description = "Port of Mednafen's GameBoy Advance core to libretro"; homepage = "https://github.com/libretro/beetle-gba-libretro"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json deleted file mode 100644 index 85ad2aa9e010..000000000000 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ /dev/null @@ -1,903 +0,0 @@ -{ - "!comment": "Generated with update_cores.py script, do not edit!", - "2048": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-2048", - "rev": "5474ed1ab880b3296c9860d0943d7de1970c79dd", - "hash": "sha256-i6bbxsLpSicDDGYKAxTMCMioHHfvBzVokun3PNYgDsc=" - }, - "version": "unstable-2024-06-28" - }, - "atari800": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-atari800", - "rev": "6a18cb23cc4a7cecabd9b16143d2d7332ae8d44b", - "hash": "sha256-+cZXHtaXnpU/zCwiDtjkyNMFGDahiHzqV2FoTCRnUWE=" - }, - "version": "unstable-2024-10-31" - }, - "beetle-gba": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-gba-libretro", - "rev": "6cee80685f735ea6c2373db2622a1f1ee9f39d39", - "hash": "sha256-a3XgExXVCUFw3GLCUkEl6now2L8qVdNOaXvrDMcT1ZE=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-lynx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-lynx-libretro", - "rev": "7fead71b49e0f08be5c4d4224fea73c6174763bf", - "hash": "sha256-fYBx/bjbhRXoVIGnEg4/oMVm705ivL1os+FfVQLRSyI=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-ngp": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-ngp-libretro", - "rev": "139fe34c8dfc5585d6ee1793a7902bca79d544de", - "hash": "sha256-ruWnCgMxfpPHTWQ7vgNUczmGRzNKKhoZTNlUcNgm4T8=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-pce": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-pce-libretro", - "rev": "af28fb0385d00e0292c4703b3aa7e72762b564d2", - "hash": "sha256-W+74RTIidSUdviihLy926OvlSdqMECvOLEEiWMtB50w=" - }, - "version": "unstable-2024-11-15" - }, - "beetle-pce-fast": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-pce-fast-libretro", - "rev": "931586f0512663f625a6e981d3047a6620281ab5", - "hash": "sha256-9Nne4upiQNSAlTZsyXcLNIwN8MMKUO1ycahowYW1sWg=" - }, - "version": "unstable-2024-11-15" - }, - "beetle-pcfx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-pcfx-libretro", - "rev": "dd04cef9355286488a1d78ff18c4c848a1575540", - "hash": "sha256-oFBuriCbJWjgPH9RRAM/XUvkW0gKXnvs7lmBpJpWewo=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-psx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-psx-libretro", - "rev": "1068cb8dbd6f312664ecf5901625cab4a6533204", - "hash": "sha256-ioAnpz6OkHWPaYE0uTEvnHV+vGzq02bQ4oUP8jW6/YA=" - }, - "version": "unstable-2024-11-15" - }, - "beetle-saturn": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-saturn-libretro", - "rev": "0a78a9a5ab0088ba19f21e028dda9f4b4d7c9e48", - "hash": "sha256-WNQhtaYBg7JqPdxcD0cLRjr2pSda6Xmx/WWYzyu5u9c=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-supafaust": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "supafaust", - "rev": "e25f66765938d33f9ad5850e8d6cd597e55b7299", - "hash": "sha256-ZgOXHhEHt54J2B1q6uA8v6uOK53g7idJlgoC4guTGow=" - }, - "version": "unstable-2024-10-01" - }, - "beetle-supergrafx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-supergrafx-libretro", - "rev": "a776133c34ae8da5daf7d9ccb43e3e292e2b07b0", - "hash": "sha256-FemWW4EPQCwhrS7YEytf6fEeimdTTfzaDdyRNDIBQyk=" - }, - "version": "unstable-2024-11-15" - }, - "beetle-vb": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-vb-libretro", - "rev": "8f837ebc077afdd6652efb2827fd8308a07113ca", - "hash": "sha256-eAnBubNhj78G4r8OHVqwFXGOSA9wEYI6ZwNyiwDW8W8=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-wswan": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-wswan-libretro", - "rev": "2aeb47d3a58bf0360c686f842d9bb5bd201306fe", - "hash": "sha256-LrF9p5tPtUamVLC41bJxcYDKvHmhVfwMieyIAdHaGmU=" - }, - "version": "unstable-2024-10-21" - }, - "blastem": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "blastem", - "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", - "hash": "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=" - }, - "version": "unstable-2022-07-26" - }, - "bluemsx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "bluemsx-libretro", - "rev": "01ce142ccb85c302420cb962d1b6e6a68a6ce076", - "hash": "sha256-h3Zpv+h6CbM1pdSOXsjN0pFUjXLn5T/R5W55VZXpMVM=" - }, - "version": "unstable-2024-10-22" - }, - "bsnes": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "bsnes-libretro", - "rev": "20c55eb6333a11395ba637df8583066483e58cb2", - "hash": "sha256-IP00xtxS3wwnQSmYltrX8GEHZX/65xnx2EsmQlE1VZM=" - }, - "version": "unstable-2024-09-06" - }, - "bsnes-hd": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "DerKoun", - "repo": "bsnes-hd", - "rev": "0bb7b8645e22ea2476cabd58f32e987b14686601", - "hash": "sha256-YzWSZMn6v5hWIHnp6KmmpevCsf35Vi2BCcmFMnrFPH0=" - }, - "version": "unstable-2024-10-21" - }, - "bsnes-mercury": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "bsnes-mercury", - "rev": "0f35d044bf2f2b879018a0500e676447e93a1db1", - "hash": "sha256-skVREKYITZn+gKKSZmwuBCWrG0jb/pifwIgat8VyQ8U=" - }, - "version": "unstable-2024-10-21" - }, - "citra": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "citra", - "rev": "2d67658e85de4767c0eefeb2829d710401c5c802", - "hash": "sha256-u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", - "fetchSubmodules": true - }, - "version": "unstable-2024-01-24" - }, - "desmume": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "desmume", - "rev": "7f05a8d447b00acd9e0798aee97b4f72eb505ef9", - "hash": "sha256-BttWMunVbfPOTGx+DV+3QyOwW+55tgXKVIn99DZhbBI=" - }, - "version": "unstable-2024-10-21" - }, - "desmume2015": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "desmume2015", - "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893", - "hash": "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=" - }, - "version": "unstable-2022-04-05" - }, - "dolphin": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "dolphin", - "rev": "89a4df725d4eb24537728f7d655cddb1add25c18", - "hash": "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs=" - }, - "version": "unstable-2024-04-19" - }, - "dosbox": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "dosbox-libretro", - "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", - "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" - }, - "version": "unstable-2022-07-18" - }, - "dosbox-pure": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "schellingb", - "repo": "dosbox-pure", - "rev": "39dd77adff71cd2ae17d80a0e48fad8583ade8e4", - "hash": "sha256-ZC3JX4BG+FUR/lcEUupISz1s8Q0AdqkO4XVIPi1L5vg=" - }, - "version": "unstable-2024-11-16" - }, - "easyrpg": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "EasyRPG", - "repo": "Player", - "rev": "f8e41f43b619413f95847536412b56f85307d378", - "hash": "sha256-nvWM4czTv/GxY9raomBEn7dmKBeLtSA9nvjMJxc3Q8s=", - "fetchSubmodules": true - }, - "version": "unstable-2023-04-29" - }, - "eightyone": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "81-libretro", - "rev": "ffc99f27f092addc9ddd34dd0e3a3d4d1c053cbf", - "hash": "sha256-3AIXk3LJHZHWIojMeo2BJHWYDHQ17WVbkwjFhXM14ZE=" - }, - "version": "unstable-2024-10-21" - }, - "fbalpha2012": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "fbalpha2012", - "rev": "77167cea72e808384c136c8c163a6b4975ce7a84", - "hash": "sha256-giEV09dT/e82bmDlRkxpkW04JcsEZc/enIPecqYtg3c=" - }, - "version": "unstable-2024-10-21" - }, - "fbneo": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "fbneo", - "rev": "d72f49f4a45dbfc5a855956d1a75ce2d0601c1c5", - "hash": "sha256-+T+HQo6IfY8+oE/mOg54Vn9NhasGYNCLXksFdSDT/xE=" - }, - "version": "unstable-2024-10-03" - }, - "fceumm": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-fceumm", - "rev": "9f53af4e332476ba99d0c056668fbb35cfb527c3", - "hash": "sha256-sTzjIuEBTKt2rZfSadQa1pDLFclLL/vwjgkTMK1ZzPQ=" - }, - "version": "unstable-2024-10-16" - }, - "flycast": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "flyinghead", - "repo": "flycast", - "rev": "d618abc3205fe185b26afe58eb5472b800ae0b42", - "hash": "sha256-hlYu1RXfzDHJh5nqBQkcwjrLtFV5AIxdBw5PZn0SUNg=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-17" - }, - "fmsx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "fmsx-libretro", - "rev": "9eb5f25df5397212a3e3088ca1a64db0740bbe5f", - "hash": "sha256-Pac1tQvPxYETU+fYU17moBHGfjNtzZiOsOms1uFQAmE=" - }, - "version": "unstable-2024-10-21" - }, - "freeintv": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "freeintv", - "rev": "beab9af119fc117833d2d866d8d4ea0857ec0236", - "hash": "sha256-+3hF7OZ2OD8K3OsvzJ3+Nn3DwC7PfD+Mr3Ku2/W/fDQ=" - }, - "version": "unstable-2024-10-21" - }, - "fuse": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "fuse-libretro", - "rev": "99df66eac096400d4d6d8fae2215192b6f03277e", - "hash": "sha256-o8FbDxke2JCUlmDZEHxMBY4f/WyHm1J76R43w+LVJfM=" - }, - "version": "unstable-2024-11-18" - }, - "gambatte": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "gambatte-libretro", - "rev": "3eeb65e9bcf4b2a7ca24c5cebdfa7e342177ef0f", - "hash": "sha256-tNGMR6GIyXen9+Ktg3IvYTcPidc+5Z8TpBQu1YgmqlY=" - }, - "version": "unstable-2024-10-04" - }, - "genesis-plus-gx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "Genesis-Plus-GX", - "rev": "7de0f0b6cde9bda1235b448aa607044b3f80ab3c", - "hash": "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM=" - }, - "version": "unstable-2024-09-18" - }, - "gpsp": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "gpsp", - "rev": "36061caf8cc5e15c3c92fb772b6b8560c7c59ec7", - "hash": "sha256-o36OUdgm7p+rAMN6R2e2Lqi4oBLTyxziw7Lr20ERBg0=" - }, - "version": "unstable-2024-10-21" - }, - "gw": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "gw-libretro", - "rev": "435e5cfd4bf6aea03a84259e9b8dba3daf3ff5bd", - "hash": "sha256-csaOqrZMSk9xZUlGAKgypV38q9XE7K6hLLdBC10g9Ao=" - }, - "version": "unstable-2024-10-21" - }, - "handy": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-handy", - "rev": "4e9e072796e5552a9d57f6ab83b3f85f27b17fb6", - "hash": "sha256-ThzFEqLCX2JC06n6GZgkGzX5sFY5CxFDjkeekXRmbXY=" - }, - "version": "unstable-2024-10-21" - }, - "hatari": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "hatari", - "rev": "7008194d3f951a157997f67a820578f56f7feee0", - "hash": "sha256-ZPzwUBaxs2ivE9n9cb5XB5mhixY9b6qIlq7OiVSLbqg=" - }, - "version": "unstable-2024-10-21" - }, - "mame": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame", - "rev": "a67797ad2f7516906ed7acef87569c6f35ca8739", - "hash": "sha256-MF6MWQftHBYL1Uv3ZYKFqCH24nd1+M73rhUzkdftMzk=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-01" - }, - "mame2000": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2000-libretro", - "rev": "2ec60f6e1078cf9ba173e80432cc28fd4eea200f", - "hash": "sha256-AYZj7bvO9oc7wmEBbj6DPRzpQFHl8diIcunSSpD4Vok=" - }, - "version": "unstable-2024-07-01" - }, - "mame2003": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2003-libretro", - "rev": "6d543115531fc96422b73c989a628600cacbea50", - "hash": "sha256-jFzFQVB0uiSRa82sq1fiMEXyzzDJqRANNgq5hj/ZAl4=" - }, - "version": "unstable-2024-11-10" - }, - "mame2003-plus": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2003-plus-libretro", - "rev": "b00ea1c9574126d75ae7b80c3b41e1186421fc1d", - "hash": "sha256-Zq4P5UsZh3p9/zasfTC+pzWiLAo7T2qAgZw4bJ4ADdM=" - }, - "version": "unstable-2024-11-19" - }, - "mame2010": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2010-libretro", - "rev": "c5b413b71e0a290c57fc351562cd47ba75bac105", - "hash": "sha256-p+uEhxjr/07YJxInhW7oJDr8KurD36JxnSfJo17FOxM=" - }, - "version": "unstable-2024-10-23" - }, - "mame2015": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2015-libretro", - "rev": "316cd06349f2b34b4719f04f7c0d07569a74c764", - "hash": "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0=" - }, - "version": "unstable-2023-11-01" - }, - "mame2016": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2016-libretro", - "rev": "01058613a0109424c4e7211e49ed83ac950d3993", - "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" - }, - "version": "unstable-2022-04-06" - }, - "melonds": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "melonds", - "rev": "7a3c11ff970cd36ca806961fae6db94b30dd5401", - "hash": "sha256-YGkRdth7qdATcZpJkBd5MGOJFG1AbeJhAnyir+ssZYA=" - }, - "version": "unstable-2024-10-21" - }, - "mesen": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mesen", - "rev": "791c5e8153ee6e29691d45b5df2cf1151ff416f9", - "hash": "sha256-PEEGJsyT+D/JwBxH2H9OY2MwaGt1i+1kmDZUT6zROic=" - }, - "version": "unstable-2024-10-21" - }, - "mesen-s": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mesen-s", - "rev": "d4fca31a6004041d99b02199688f84c009c55967", - "hash": "sha256-mGGTLBRJCsNJg57LWSFndIv/LLzEmVRnv6gNbllkV/Y=" - }, - "version": "unstable-2024-10-21" - }, - "meteor": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "meteor-libretro", - "rev": "e533d300d0561564451bde55a2b73119c768453c", - "hash": "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=" - }, - "version": "unstable-2020-12-28" - }, - "mgba": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mgba", - "rev": "747362c02d2e71ee7c363e8dcb240925be8af906", - "hash": "sha256-dBhdS6C1H02iwdYDVvJmkPWob81vpmQJdHUHJFAq2vo=" - }, - "version": "unstable-2024-11-12" - }, - "mrboom": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "Javanaise", - "repo": "mrboom-libretro", - "rev": "22765ce7176d236d846f504318a51c448d2b469b", - "hash": "sha256-hzdc4PM/EARNEtpeATo4VohXtkeBra6rCz3tdIgBfVw=", - "fetchSubmodules": true - }, - "version": "unstable-2024-07-01" - }, - "mupen64plus": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mupen64plus-libretro-nx", - "rev": "4249e39b2c200e5f0895385f76d99928785f2bea", - "hash": "sha256-nII/PMYo2xLznmAcKs6jDWGRS1DC3tiDeT6KJKRnaCI=" - }, - "version": "unstable-2024-10-29" - }, - "neocd": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "neocd_libretro", - "rev": "5eca2c8fd567b5261251c65ecafa8cf5b179d1d2", - "hash": "sha256-72tmPCb7AXsamaQsMAPiYpgDR8DER2GTz4hcbN8wy7g=" - }, - "version": "unstable-2024-10-21" - }, - "nestopia": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "nestopia", - "rev": "b932740e8abbe2cda80d06b083fdd8115af1c5d5", - "hash": "sha256-lIWk3V93vTKZM/jvfLkA06c7DDSEQtLmqRzJUi0TK/4=" - }, - "version": "unstable-2024-10-17" - }, - "np2kai": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "AZO234", - "repo": "NP2kai", - "rev": "4b109eaac4f79b04065ff5025319fce51537e04d", - "hash": "sha256-tRFvK8d5Y/umy/b1BKN85ZSaDWyK95hII4RVng7A5uU=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-03" - }, - "nxengine": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "nxengine-libretro", - "rev": "9adc032a5f6aa913d71d22042bb72cb11cf0f4a2", - "hash": "sha256-8XjZp18lQU3xFNDjIuNsSHn7Mhba8Lze/IeRsy8/U1U=" - }, - "version": "unstable-2024-10-21" - }, - "o2em": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-o2em", - "rev": "c8f458d035392963823fbb50db0cec0033d9315f", - "hash": "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U=" - }, - "version": "unstable-2024-06-28" - }, - "opera": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "opera-libretro", - "rev": "67a29e60a4d194b675c9272b21b61eaa022f3ba3", - "hash": "sha256-8896EWNbzVyr3MS1jtWD3pLur7ZvAhhJmrwkW3ayzkU=" - }, - "version": "unstable-2024-10-17" - }, - "parallel-n64": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "parallel-n64", - "rev": "e372c5e327dcd649e9d840ffc3d88480b6866eda", - "hash": "sha256-q4octB5XDdl4PtLYVZfBgydVBNaOwzu9dPBY+Y68lVo=" - }, - "version": "unstable-2024-10-21" - }, - "pcsx2": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "lrps2", - "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", - "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" - }, - "version": "unstable-2023-01-30" - }, - "pcsx_rearmed": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "pcsx_rearmed", - "rev": "e3d7ea45c75f2752e351d5c5b54cf7e79e66d26e", - "hash": "sha256-dJqomyUHYQ+vpyu7/w2S/NidgYbHiGBWjebFQAXjzI0=" - }, - "version": "unstable-2024-11-17" - }, - "picodrive": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "picodrive", - "rev": "0daf92b57fba1fdbc124651573e88373eef28aa5", - "hash": "sha256-rvgcGNpHhjHpg5q6qiu08lBn+Zjx87E5/Q98gPoffhE=", - "fetchSubmodules": true - }, - "version": "unstable-2024-10-19" - }, - "play": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "jpd002", - "repo": "Play-", - "rev": "c3cba5418b4e5618befd9c2790498cf3cf88372a", - "hash": "sha256-xO2Pgl1E0JFEsthTmG+Ka+NqOTWG/JeeAIa6wBWXJyc=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-14" - }, - "ppsspp": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "hrydgard", - "repo": "ppsspp", - "rev": "2402eea4b16908ad59079bcf3fab06ba63531a3c", - "hash": "sha256-bpeiZdcXkGWLFZOsxTGuVmo4xAiUb9v5Wf6pWkt5JV0=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-15" - }, - "prboom": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-prboom", - "rev": "d25ccfb9739069824d8fff99e3ae78a58a09df01", - "hash": "sha256-IaMreS2MSkFdZ3Jff2FOZBvKIIa4KIkp41LIg3PLl44=" - }, - "version": "unstable-2024-10-21" - }, - "prosystem": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "prosystem-libretro", - "rev": "acae250da8d98b8b9707cd499e2a0bf6d8500652", - "hash": "sha256-AGF3K3meZEEsnzHmMTCsFXBGNvWVELH8a8qET07kP0o=" - }, - "version": "unstable-2024-10-21" - }, - "puae": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-uae", - "rev": "c60e42ef9ad474518d4be859b7c1da2c0c7e1d6f", - "hash": "sha256-WCkz7BUgYaI+yRhPmNuOKGJC/GxV+n2aeJVn8vhx0Ng=" - }, - "version": "unstable-2024-10-19" - }, - "quicknes": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "QuickNES_Core", - "rev": "dbf19f73e3eb9701d1c7f5898f57c097e05c9fbd", - "hash": "sha256-oFQUMp1imc8JCsQYCy1BtIUmTC+u0VcoYHpWzUpKNb4=" - }, - "version": "unstable-2024-10-21" - }, - "same_cdi": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "same_cdi", - "rev": "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0", - "hash": "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=" - }, - "version": "unstable-2023-02-28" - }, - "sameboy": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "sameboy", - "rev": "51433012a871a44555492273fd22f29867d12655", - "hash": "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw=" - }, - "version": "unstable-2024-06-28" - }, - "scummvm": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro-mirrors", - "repo": "scummvm", - "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", - "hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=" - }, - "version": "unstable-2022-04-06" - }, - "smsplus-gx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "smsplus-gx", - "rev": "c642bbd0680b5959180a420036108893d0aec961", - "hash": "sha256-SHBrwzLyVZ4Tp/kVCnr4xj2B3pmdg+JUmZUM7hYao64=" - }, - "version": "unstable-2024-10-21" - }, - "snes9x": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "snes9xgit", - "repo": "snes9x", - "rev": "fd05ca7df5259a2cd0aa9204f331e0b05126c376", - "hash": "sha256-o/Rb1XQ7QoI0hKROMFZ9igyH8NN3bMryvyU4oNUqtRA=" - }, - "version": "unstable-2024-10-28" - }, - "snes9x2002": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "snes9x2002", - "rev": "a0709ec7dcd6de2fbebb43106bd757b649e3b7cf", - "hash": "sha256-rrMPhXIsQ48fVvjgZgC3xeqm9k9kwe43oZNzs2d/h1Q=" - }, - "version": "unstable-2024-10-21" - }, - "snes9x2005": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "snes9x2005", - "rev": "74d871db9b4dba6dbe6c5ecebc88cbf255be5349", - "hash": "sha256-YlRMjSEo9sdLVRzWGSJlnBeqg6wUhZi8l3ffzUaKQIQ=" - }, - "version": "unstable-2024-10-21" - }, - "snes9x2010": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "snes9x2010", - "rev": "f9ae8fd28b13070a945a829ccf41cbf90a21d0f7", - "hash": "sha256-nsExAYnzDenPvXzeN60jGykRTrCGMi/mRPV+vgS8ZtE=" - }, - "version": "unstable-2024-11-18" - }, - "stella": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "stella-emu", - "repo": "stella", - "rev": "0e2ce2771c7d0c9b2dd5c06e3a4746738d3c9e47", - "hash": "sha256-axt5wvH7WENh1ALPYc+f5XpCv2xPm5jYx26zMhLEt3E=" - }, - "version": "unstable-2024-11-17" - }, - "stella2014": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "stella2014-libretro", - "rev": "3cc89f0d316d6c924a5e3f4011d17421df58e615", - "hash": "sha256-2gnFWau7F45SdzoqDUlqYXfXVE1EUPozHZv7BhyRRIA=" - }, - "version": "unstable-2024-10-21" - }, - "swanstation": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "swanstation", - "rev": "37cd87e14ca09ac1b558e5b2c7db4ad256865bbb", - "hash": "sha256-dNIxlTPoY4S6VMtTN22ti3DE4aU/8XN/XhAo3DMNR/E=" - }, - "version": "unstable-2024-07-24" - }, - "tgbdual": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "tgbdual-libretro", - "rev": "8d305769eebd67266c284558f9d3a30498894d3d", - "hash": "sha256-3mlnTgp43qC3yifpr6pvtC4vslddcf6mephKA183vEk=" - }, - "version": "unstable-2024-10-21" - }, - "thepowdertoy": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "ThePowderToy", - "rev": "5d9c749780063b87bd62ddb025dee4241f196f26", - "hash": "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8=" - }, - "version": "unstable-2024-10-01" - }, - "tic80": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "tic-80", - "rev": "6412f72d0f4725c153ce3d245729b829e713542e", - "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", - "fetchSubmodules": true - }, - "version": "unstable-2024-05-13" - }, - "vba-m": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "vbam-libretro", - "rev": "379dd97301458a51fb69dd93ba21b64f81e01ef2", - "hash": "sha256-UbXSHdKfa91MpcYityo+aILbI0DfkLqZh8YfGcRx/BI=" - }, - "version": "unstable-2024-10-21" - }, - "vba-next": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "vba-next", - "rev": "2c726f25da75a5600ef5791ce904befe06c4dddd", - "hash": "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs=" - }, - "version": "unstable-2024-06-28" - }, - "vecx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-vecx", - "rev": "0e48a8903bd9cc359da3f7db783f83e22722c0cf", - "hash": "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU=" - }, - "version": "unstable-2024-06-28" - }, - "virtualjaguar": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "virtualjaguar-libretro", - "rev": "48096c1f6f8b98cfff048a5cb4e6a86686631072", - "hash": "sha256-DLBQQARHqupGGQS8YznDSSMuxQliyt5apGA4Ku2jlYo=" - }, - "version": "unstable-2024-10-21" - }, - "yabause": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "yabause", - "rev": "c35712c5ed33e18d77097f2059a036e19d1d66f2", - "hash": "sha256-4/gxWNPkGKBf4ti7ZF4GXgng6ZPyM9prrvK0S5tZ6V8=" - }, - "version": "unstable-2024-10-21" - } -} diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index 86f05d6895e3..42124cb23609 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -1,19 +1,22 @@ -{ lib -, stdenv -, core -, repo ? null # TODO: remove -, makeWrapper -, retroarchBare -, zlib -, makefile ? "Makefile.libretro" -, extraBuildInputs ? [ ] -, extraNativeBuildInputs ? [ ] - # Location of resulting RetroArch core on $out -, libretroCore ? "/lib/retroarch/cores" - # The core filename is derivated from the core name - # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename -, normalizeCore ? true -, ... +{ + # Deps + lib, + stdenv, + makeWrapper, + retroarchBare, + unstableGitUpdater, + zlib, + # Params + core, + makefile ? "Makefile.libretro", + extraBuildInputs ? [ ], + extraNativeBuildInputs ? [ ], + ## Location of resulting RetroArch core on $out + libretroCore ? "/lib/retroarch/cores", + ## The core filename is derivated from the core name + ## Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename + normalizeCore ? true, + ... }@args: let @@ -24,62 +27,74 @@ let extraArgs = builtins.removeAttrs args [ "lib" "stdenv" - "core" "makeWrapper" - "retroarch" + "retroarchBare" + "unstableGitUpdater" "zlib" + + "core" "makefile" "extraBuildInputs" "extraNativeBuildInputs" "libretroCore" "normalizeCore" - "makeFlags" - "meta" ]; in -stdenv.mkDerivation ({ - pname = "libretro-${core}"; +stdenv.mkDerivation ( + { + pname = "libretro-${core}"; - buildInputs = [ zlib ] ++ extraBuildInputs; - nativeBuildInputs = [ makeWrapper ] ++ extraNativeBuildInputs; + buildInputs = [ zlib ] ++ extraBuildInputs; + nativeBuildInputs = [ makeWrapper ] ++ extraNativeBuildInputs; - inherit makefile; + inherit makefile; - makeFlags = [ - "platform=${{ - linux = "unix"; - darwin = "osx"; - windows = "win"; - }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}" - "ARCH=${{ - armv7l = "arm"; - armv6l = "arm"; - aarch64 = "arm64"; - i686 = "x86"; - }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" - ] ++ (args.makeFlags or [ ]); + makeFlags = [ + "platform=${ + { + linux = "unix"; + darwin = "osx"; + windows = "win"; + } + .${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name + }" + "ARCH=${ + { + armv7l = "arm"; + armv6l = "arm"; + aarch64 = "arm64"; + i686 = "x86"; + } + .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name + }" + ] ++ (args.makeFlags or [ ]); - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - install -Dt ${coreDir} ${coreFilename} - makeWrapper ${retroarchBare}/bin/retroarch $out/bin/${mainProgram} \ - --add-flags "-L ${coreDir}/${coreFilename}" + install -Dt ${coreDir} ${coreFilename} + makeWrapper ${retroarchBare}/bin/retroarch $out/bin/${mainProgram} \ + --add-flags "-L ${coreDir}/${coreFilename}" - runHook postInstall - ''; + runHook postInstall + ''; - enableParallelBuilding = true; + enableParallelBuilding = true; - passthru = { - inherit core libretroCore; - updateScript = lib.mkIf (repo != null) [ ./update_cores.py repo ]; - } // (args.passthru or { }); + passthru = { + inherit core libretroCore; + updateScript = unstableGitUpdater { }; + } // (args.passthru or { }); - meta = with lib; { - inherit mainProgram; - inherit (retroarchBare.meta) platforms; - homepage = "https://www.libretro.com/"; - maintainers = with maintainers; teams.libretro.members ++ [ hrdinka ]; - } // (args.meta or { }); -} // extraArgs) + meta = + with lib; + { + inherit mainProgram; + inherit (retroarchBare.meta) platforms; + homepage = "https://www.libretro.com/"; + maintainers = with maintainers; teams.libretro.members; + } + // (args.meta or { }); + } + // extraArgs +) diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py deleted file mode 100755 index 4e15315ce726..000000000000 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ /dev/null @@ -1,233 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-git -p nix-prefetch-scripts - -import json -import os -import subprocess -import sys -from concurrent.futures import ThreadPoolExecutor -from pathlib import Path - -SCRIPT_PATH = Path(__file__).absolute().parent -HASHES_PATH = SCRIPT_PATH / "hashes.json" -GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) -# To add a new core, add it to the dictionary below. You need to set at least -# `repo`, that is the repository name if the owner of the repository is -# `libretro` itself, otherwise also set `owner`. -# You may set `deep_clone`, `fetch_submodules` or `leave_dot_git` options to -# `True` and they're similar to `fetchgit` options. Also if for some reason you -# need to pin a specific revision, set `rev` to a commit. -# There is also a `fetcher` option that for now only supports `fetchFromGitHub` -# (see `get_repo_hash()`), but it may be extended in the future if there is a -# need to support fetchers from other source hubs. -# To generate the hash file for your new core, you can run -# `/pkgs/applications/emulators/retroarch/update_cores.py `. Do -# not forget to add your core to `cores.nix` file with the proper overrides so -# the core can be build. -CORES = { - "2048": {"repo": "libretro-2048"}, - "atari800": {"repo": "libretro-atari800"}, - "beetle-gba": {"repo": "beetle-gba-libretro"}, - "beetle-lynx": {"repo": "beetle-lynx-libretro"}, - "beetle-ngp": {"repo": "beetle-ngp-libretro"}, - "beetle-pce": {"repo": "beetle-pce-libretro"}, - "beetle-pce-fast": {"repo": "beetle-pce-fast-libretro"}, - "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, - "beetle-psx": {"repo": "beetle-psx-libretro"}, - "beetle-saturn": {"repo": "beetle-saturn-libretro"}, - "beetle-supafaust": {"repo": "supafaust"}, - "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, - "beetle-vb": {"repo": "beetle-vb-libretro"}, - "beetle-wswan": {"repo": "beetle-wswan-libretro"}, - "blastem": {"repo": "blastem"}, - "bluemsx": {"repo": "bluemsx-libretro"}, - "bsnes": {"repo": "bsnes-libretro"}, - "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"}, - "bsnes-mercury": {"repo": "bsnes-mercury"}, - "citra": {"repo": "citra", "fetch_submodules": True}, - "desmume": {"repo": "desmume"}, - "desmume2015": {"repo": "desmume2015"}, - "dolphin": {"repo": "dolphin"}, - "dosbox": {"repo": "dosbox-libretro"}, - "dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"}, - # The EasyRPG core is pinned to 0.8 since it depends on version 0.8 of liblcf, which - # was released in April 2023. - # Update the version when a compatible liblcf is available. - # See pkgs/games/easyrpg-player/default.nix for details. - "easyrpg": {"repo": "Player", "owner": "EasyRPG", "fetch_submodules": True, "rev": "0.8"}, - "eightyone": {"repo": "81-libretro"}, - "fbalpha2012": {"repo": "fbalpha2012"}, - "fbneo": {"repo": "fbneo"}, - "fceumm": {"repo": "libretro-fceumm"}, - "flycast": {"repo": "flycast", "owner": "flyinghead", "fetch_submodules": True}, - "fmsx": {"repo": "fmsx-libretro"}, - "freeintv": {"repo": "freeintv"}, - "fuse": {"repo": "fuse-libretro"}, - "gambatte": {"repo": "gambatte-libretro"}, - "genesis-plus-gx": {"repo": "Genesis-Plus-GX"}, - "gpsp": {"repo": "gpsp"}, - "gw": {"repo": "gw-libretro"}, - "handy": {"repo": "libretro-handy"}, - "hatari": {"repo": "hatari"}, - # Setting fetch_submodules=True since libretro/mame constantly gives - # different hashes for its tarballs, see: - # - https://github.com/NixOS/nixpkgs/issues/259488#issuecomment-1751768379 - # - https://github.com/NixOS/nixpkgs/pull/303494 - "mame": {"repo": "mame", "fetch_submodules": True}, - "mame2000": {"repo": "mame2000-libretro"}, - "mame2003": {"repo": "mame2003-libretro"}, - "mame2003-plus": {"repo": "mame2003-plus-libretro"}, - "mame2010": {"repo": "mame2010-libretro"}, - "mame2015": {"repo": "mame2015-libretro"}, - "mame2016": {"repo": "mame2016-libretro"}, - "melonds": {"repo": "melonds"}, - "mesen": {"repo": "mesen"}, - "mesen-s": {"repo": "mesen-s"}, - "meteor": {"repo": "meteor-libretro"}, - "mrboom": {"repo": "mrboom-libretro", "owner": "Javanaise", "fetch_submodules": True}, - "mgba": {"repo": "mgba"}, - "mupen64plus": {"repo": "mupen64plus-libretro-nx"}, - "neocd": {"repo": "neocd_libretro"}, - "nestopia": {"repo": "nestopia"}, - "nxengine": {"repo": "nxengine-libretro"}, - "np2kai": {"repo": "NP2kai", "owner": "AZO234", "fetch_submodules": True}, - "o2em": {"repo": "libretro-o2em"}, - "opera": {"repo": "opera-libretro"}, - "parallel-n64": {"repo": "parallel-n64"}, - # libretro/lrps2 is a hard-fork of pcsx2 with simplified code to target - # only libretro, while libretro/pcsx2 is supposedly closer to upstream but - # it is a WIP. - # TODO: switch to libretro/pcsx2 when upstream switches to it. - "pcsx2": {"repo": "lrps2"}, - "pcsx_rearmed": {"repo": "pcsx_rearmed"}, - "picodrive": {"repo": "picodrive", "fetch_submodules": True}, - "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True}, - "ppsspp": {"repo": "ppsspp", "owner": "hrydgard", "fetch_submodules": True}, - "prboom": {"repo": "libretro-prboom"}, - "prosystem": {"repo": "prosystem-libretro"}, - "puae": {"repo": "libretro-uae"}, - "quicknes": {"repo": "QuickNES_Core"}, - "sameboy": {"repo": "sameboy"}, - "same_cdi": {"repo": "same_cdi"}, - # This is the old source code before they upstreamed the source code, - # so now the libretro related code lives in the scummvm/scummvm repository. - # However this broke the old way we were doing builds, so for now point - # to a mirror with the old source code until this issue is fixed. - # TODO: switch to libretro/scummvm since this is more up-to-date - "scummvm": {"repo": "scummvm", "owner": "libretro-mirrors"}, - "smsplus-gx": {"repo": "smsplus-gx"}, - "snes9x": {"repo": "snes9x", "owner": "snes9xgit"}, - "snes9x2002": {"repo": "snes9x2002"}, - "snes9x2005": {"repo": "snes9x2005"}, - "snes9x2010": {"repo": "snes9x2010"}, - "stella": {"repo": "stella", "owner": "stella-emu"}, - "stella2014": {"repo": "stella2014-libretro"}, - "swanstation": {"repo": "swanstation"}, - "tgbdual": {"repo": "tgbdual-libretro"}, - "thepowdertoy": {"repo": "ThePowderToy"}, - "tic80": {"repo": "tic-80", "fetch_submodules": True}, - "vba-m": {"repo": "vbam-libretro"}, - "vba-next": {"repo": "vba-next"}, - "vecx": {"repo": "libretro-vecx"}, - "virtualjaguar": {"repo": "virtualjaguar-libretro"}, - "yabause": {"repo": "yabause"}, -} - - -def info(*msg): - print(*msg, file=sys.stderr) - - -def get_repo_hash_fetchFromGitHub( - repo, - owner="libretro", - deep_clone=False, - fetch_submodules=False, - leave_dot_git=False, - rev=None, -): - extra_args = [] - if deep_clone: - extra_args.append("--deep-clone") - else: - extra_args.append("--no-deep-clone") - if fetch_submodules: - extra_args.append("--fetch-submodules") - else: - extra_args.append("--no-fetch-submodules") - if leave_dot_git: - extra_args.append("--leave-dot-git") - else: - extra_args.append("--no-leave-dot-git") - if rev: - extra_args.append("--rev") - extra_args.append(rev) - try: - result = subprocess.run( - ["nix-prefetch-github", owner, repo, "--meta", *extra_args], - check=True, - capture_output=True, - text=True, - ) - except subprocess.CalledProcessError as ex: - info(f"Error while updating {owner}/{repo}:", ex.stderr) - raise ex - - j = json.loads(result.stdout) - return { - "fetcher": "fetchFromGitHub", - # Remove False values - "src": {k: v for k, v in j["src"].items() if v}, - "version": f"unstable-{j['meta']['commitDate']}", - } - - -def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): - if fetcher == "fetchFromGitHub": - return get_repo_hash_fetchFromGitHub(**kwargs) - else: - raise ValueError(f"Unsupported fetcher: {fetcher}") - - -def get_repo_hashes(cores={}): - def get_repo_hash_from_core_def(core_def): - core, repo = core_def - info(f"Getting repo hash for '{core}'...") - result = core, get_repo_hash(**repo) - info(f"Got repo hash for '{core}'!") - return result - - with open(HASHES_PATH) as f: - repo_hashes = json.loads(f.read()) - - info(f"Running with {GET_REPO_THREADS} threads!") - with ThreadPoolExecutor(max_workers=GET_REPO_THREADS) as executor: - new_repo_hashes = executor.map(get_repo_hash_from_core_def, cores.items()) - - for core, repo in new_repo_hashes: - repo_hashes[core] = repo - - return repo_hashes - - -def main(): - # If you don't want to update all cores, pass the name of the cores you - # want to update on the command line. E.g.: - # $ ./update.py citra snes9x - if len(sys.argv) > 1: - cores_to_update = sys.argv[1:] - else: - cores_to_update = CORES.keys() - - cores = {core: repo for core, repo in CORES.items() if core in cores_to_update} - repo_hashes = get_repo_hashes(cores) - repo_hashes["!comment"] = "Generated with update_cores.py script, do not edit!" - info(f"Generating '{HASHES_PATH}'...") - with open(HASHES_PATH, "w") as f: - f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4)) - f.write("\n") - info("Finished!") - - -if __name__ == "__main__": - main() From 967dae48b2187acd90ca8ce90d14228f950ae56c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 16:50:33 +0000 Subject: [PATCH 166/192] libretro: update README.md --- .../emulators/retroarch/README.md | 44 +++---------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/README.md b/pkgs/applications/emulators/retroarch/README.md index 74b600e069bd..1a1fec0ed1d1 100644 --- a/pkgs/applications/emulators/retroarch/README.md +++ b/pkgs/applications/emulators/retroarch/README.md @@ -1,46 +1,16 @@ -# RetroArch +# Libretro -This directory includes [RetroArch](https://www.retroarch.com/), [libretro -cores](https://docs.libretro.com/guides/core-list/) and related packages. +[libretro cores](https://docs.libretro.com/guides/core-list/) and related +packages. ## Adding new cores The basic steps to add a new core are: -1. Add the core repository to [update_cores.py](./update_cores.py) inside the - `CORES` map. - - The minimum required parameter is `repo` - - If the repository owner is not `libretro`, set `owner` parameter - - If the core needs submodules, set `fetch_submodules` parameter to `True` - - To pin the core to a specific release, set `rev` parameter -2. Run `./pkgs/applications/emulators/retroarch/update_cores.py ` to - generate [`hashes.json`](./hashes.json) file -3. Add your new core to [`cores.nix`](./cores.nix) file, using - [`mkLibretroCore`](./mkLibretroCore.nix) function - - In general, the attribute name should be the same as the repo name, unless - there is a good reason not to - - Check the core repo and [Libretro - documentation](https://docs.libretro.com/) for the core you're trying to add - for instructions on how to build - - Also check the examples inside [`cores.nix`](./cores.nix) - - If your core is recently released, there is a good chance that you may - need to update [`libretro-core-info`](./libretro-core-info.nix) for things - to work inside RetroArch -4. Try to build your core with `nix-build -A libretro.` - -## Updating cores - -Just run: - -```console -# From the root of your nixpkgs directory -./pkgs/applications/emulators/retroarch/update_cores.nix -``` - -Keep in mind that because of the huge amount of cores that we package here, it -is recommended to set `GITHUB_TOKEN` to your GitHub's [Personal Access -Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) -(PAT), otherwise the update will probably fail due to GitHub's API rate limit. +1. Add a new core using `mkLibretroCore` function (use one of the existing + files as an example) +2. Add your new core to [`default.nix`](./default.nix) file +3. Try to build your core with `nix-build -A libretro.` ## Using RetroArch with cores From ef3c223fdbecd488a30fe9f28d5f5067d5fb8e4f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 18:38:20 +0000 Subject: [PATCH 167/192] libretro: add 0-prefix before version --- pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-pce.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-psx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix | 2 +- .../applications/emulators/retroarch/cores/beetle-supafaust.nix | 2 +- .../emulators/retroarch/cores/beetle-supergrafx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-vb.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix | 2 +- pkgs/applications/emulators/retroarch/cores/blastem.nix | 2 +- pkgs/applications/emulators/retroarch/cores/bluemsx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix | 2 +- pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix | 2 +- pkgs/applications/emulators/retroarch/cores/bsnes.nix | 2 +- pkgs/applications/emulators/retroarch/cores/citra.nix | 2 +- pkgs/applications/emulators/retroarch/cores/desmume.nix | 2 +- pkgs/applications/emulators/retroarch/cores/desmume2015.nix | 2 +- pkgs/applications/emulators/retroarch/cores/dolphin.nix | 2 +- pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix | 2 +- pkgs/applications/emulators/retroarch/cores/dosbox.nix | 2 +- pkgs/applications/emulators/retroarch/cores/eightyone.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fbneo.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fceumm.nix | 2 +- pkgs/applications/emulators/retroarch/cores/flycast.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fmsx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/freeintv.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fuse.nix | 2 +- pkgs/applications/emulators/retroarch/cores/gambatte.nix | 2 +- pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/gpsp.nix | 2 +- pkgs/applications/emulators/retroarch/cores/gw.nix | 2 +- pkgs/applications/emulators/retroarch/cores/handy.nix | 2 +- pkgs/applications/emulators/retroarch/cores/hatari.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2000.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2003.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2010.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2015.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2016.nix | 2 +- pkgs/applications/emulators/retroarch/cores/melonds.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mesen-s.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mesen.nix | 2 +- pkgs/applications/emulators/retroarch/cores/meteor.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mgba.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mrboom.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mupen64plus.nix | 2 +- pkgs/applications/emulators/retroarch/cores/neocd.nix | 2 +- pkgs/applications/emulators/retroarch/cores/nestopia.nix | 2 +- pkgs/applications/emulators/retroarch/cores/np2kai.nix | 2 +- pkgs/applications/emulators/retroarch/cores/nxengine.nix | 2 +- pkgs/applications/emulators/retroarch/cores/o2em.nix | 2 +- pkgs/applications/emulators/retroarch/cores/opera.nix | 2 +- pkgs/applications/emulators/retroarch/cores/parallel-n64.nix | 2 +- pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix | 2 +- pkgs/applications/emulators/retroarch/cores/pcsx2.nix | 2 +- pkgs/applications/emulators/retroarch/cores/picodrive.nix | 2 +- pkgs/applications/emulators/retroarch/cores/play.nix | 2 +- pkgs/applications/emulators/retroarch/cores/ppsspp.nix | 2 +- pkgs/applications/emulators/retroarch/cores/prboom.nix | 2 +- pkgs/applications/emulators/retroarch/cores/prosystem.nix | 2 +- pkgs/applications/emulators/retroarch/cores/puae.nix | 2 +- pkgs/applications/emulators/retroarch/cores/quicknes.nix | 2 +- pkgs/applications/emulators/retroarch/cores/same_cdi.nix | 2 +- pkgs/applications/emulators/retroarch/cores/sameboy.nix | 2 +- pkgs/applications/emulators/retroarch/cores/scummvm.nix | 2 +- pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/snes9x.nix | 2 +- pkgs/applications/emulators/retroarch/cores/snes9x2002.nix | 2 +- pkgs/applications/emulators/retroarch/cores/snes9x2005.nix | 2 +- pkgs/applications/emulators/retroarch/cores/snes9x2010.nix | 2 +- pkgs/applications/emulators/retroarch/cores/stella.nix | 2 +- pkgs/applications/emulators/retroarch/cores/stella2014.nix | 2 +- pkgs/applications/emulators/retroarch/cores/swanstation.nix | 2 +- pkgs/applications/emulators/retroarch/cores/tgbdual.nix | 2 +- pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix | 2 +- pkgs/applications/emulators/retroarch/cores/tic80.nix | 2 +- .../emulators/retroarch/cores/twenty-fortyeight.nix | 2 +- pkgs/applications/emulators/retroarch/cores/vba-m.nix | 2 +- pkgs/applications/emulators/retroarch/cores/vba-next.nix | 2 +- pkgs/applications/emulators/retroarch/cores/vecx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix | 2 +- pkgs/applications/emulators/retroarch/cores/yabause.nix | 2 +- 86 files changed, 86 insertions(+), 86 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix index 502d8c5df34f..dcc3a00d1d2a 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-lynx"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix b/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix index 6c86135282ad..567d7332466b 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-ngp"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix index 1af81b8c3c27..f3c9551a9cc0 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix index 934ff1e0ba0d..346ebc6cb3b6 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-pce"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix index d53405fb3cb2..047a25cd2afa 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-pcfx"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix index 2c76381d3bb4..aebe33c49013 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix @@ -8,7 +8,7 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix b/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix index 196453f1a171..e648472b14ff 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-saturn"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix b/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix index 6f3f9537a00f..3f8d18fec719 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-supafaust"; - version = "unstable-2024-10-01"; + version = "0-unstable-2024-10-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix index 8737d5a824b2..3f0597c4f6ca 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-supergrafx"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix b/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix index 1262b40854c7..e6af3a42ae21 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-vb"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix b/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix index 14a856a54220..39b2afda52e9 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-wswan"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/blastem.nix b/pkgs/applications/emulators/retroarch/cores/blastem.nix index 395d568540ac..cdcba56c6a98 100644 --- a/pkgs/applications/emulators/retroarch/cores/blastem.nix +++ b/pkgs/applications/emulators/retroarch/cores/blastem.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "blastem"; - version = "unstable-2022-07-26"; + version = "0-unstable-2022-07-26"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/bluemsx.nix b/pkgs/applications/emulators/retroarch/cores/bluemsx.nix index f3be7a2d1ca5..1f352cf6356b 100644 --- a/pkgs/applications/emulators/retroarch/cores/bluemsx.nix +++ b/pkgs/applications/emulators/retroarch/cores/bluemsx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "bluemsx"; - version = "unstable-2024-10-22"; + version = "0-unstable-2024-10-22"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix b/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix index 33cef08d93bf..5353a8ef49b5 100644 --- a/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix +++ b/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "bsnes-hd-beta"; - version = "unstable-2023-04-26"; + version = "0-unstable-2023-04-26"; src = fetchFromGitHub { owner = "DerKoun"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix b/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix index f86a355a7c69..edb377829e11 100644 --- a/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix +++ b/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "bsnes-mercury-${withProfile}"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes.nix b/pkgs/applications/emulators/retroarch/cores/bsnes.nix index 533aaa0763f9..0e31a09943da 100644 --- a/pkgs/applications/emulators/retroarch/cores/bsnes.nix +++ b/pkgs/applications/emulators/retroarch/cores/bsnes.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "bsnes"; - version = "unstable-2024-09-06"; + version = "0-unstable-2024-09-06"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/citra.nix b/pkgs/applications/emulators/retroarch/cores/citra.nix index 1a826fed9eaa..1739d978d4d0 100644 --- a/pkgs/applications/emulators/retroarch/cores/citra.nix +++ b/pkgs/applications/emulators/retroarch/cores/citra.nix @@ -11,7 +11,7 @@ }: mkLibretroCore rec { core = "citra"; - version = "unstable-2024-04-01"; + version = "0-unstable-2024-04-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/desmume.nix b/pkgs/applications/emulators/retroarch/cores/desmume.nix index 5236a4bddc1f..bd03cb5bf341 100644 --- a/pkgs/applications/emulators/retroarch/cores/desmume.nix +++ b/pkgs/applications/emulators/retroarch/cores/desmume.nix @@ -10,7 +10,7 @@ }: mkLibretroCore { core = "desmume"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/desmume2015.nix b/pkgs/applications/emulators/retroarch/cores/desmume2015.nix index af9f8870d846..6b654234aee6 100644 --- a/pkgs/applications/emulators/retroarch/cores/desmume2015.nix +++ b/pkgs/applications/emulators/retroarch/cores/desmume2015.nix @@ -10,7 +10,7 @@ }: mkLibretroCore { core = "desmume2015"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/dolphin.nix b/pkgs/applications/emulators/retroarch/cores/dolphin.nix index f73ecff6c673..b645617b4696 100644 --- a/pkgs/applications/emulators/retroarch/cores/dolphin.nix +++ b/pkgs/applications/emulators/retroarch/cores/dolphin.nix @@ -17,7 +17,7 @@ }: mkLibretroCore { core = "dolphin"; - version = "unstable-2024-04-19"; + version = "0-unstable-2024-04-19"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix b/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix index 152ad2e280af..da24544b5f17 100644 --- a/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "unstable-2024-09-28"; + version = "0-unstable-2024-09-28"; src = fetchFromGitHub { owner = "schellingb"; diff --git a/pkgs/applications/emulators/retroarch/cores/dosbox.nix b/pkgs/applications/emulators/retroarch/cores/dosbox.nix index 50eb9ab55e9f..3dfc236eb0c5 100644 --- a/pkgs/applications/emulators/retroarch/cores/dosbox.nix +++ b/pkgs/applications/emulators/retroarch/cores/dosbox.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "dosbox"; - version = "unstable-2022-07-18"; + version = "0-unstable-2022-07-18"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/eightyone.nix b/pkgs/applications/emulators/retroarch/cores/eightyone.nix index e17e03605ec7..88f0fa5822df 100644 --- a/pkgs/applications/emulators/retroarch/cores/eightyone.nix +++ b/pkgs/applications/emulators/retroarch/cores/eightyone.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "81"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix b/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix index 17d8e1fe2e07..febf6f7935a8 100644 --- a/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix +++ b/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fbalpha2012"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/fbneo.nix b/pkgs/applications/emulators/retroarch/cores/fbneo.nix index 486d44da6fb3..238d96778a98 100644 --- a/pkgs/applications/emulators/retroarch/cores/fbneo.nix +++ b/pkgs/applications/emulators/retroarch/cores/fbneo.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fbneo"; - version = "unstable-2024-10-03"; + version = "0-unstable-2024-10-03"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/fceumm.nix b/pkgs/applications/emulators/retroarch/cores/fceumm.nix index e8ada8587cbf..93c6956d18b1 100644 --- a/pkgs/applications/emulators/retroarch/cores/fceumm.nix +++ b/pkgs/applications/emulators/retroarch/cores/fceumm.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fceumm"; - version = "unstable-2024-09-23"; + version = "0-unstable-2024-09-23"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/flycast.nix b/pkgs/applications/emulators/retroarch/cores/flycast.nix index 43982c818d2d..77abcb4eaded 100644 --- a/pkgs/applications/emulators/retroarch/cores/flycast.nix +++ b/pkgs/applications/emulators/retroarch/cores/flycast.nix @@ -8,7 +8,7 @@ }: mkLibretroCore { core = "flycast"; - version = "unstable-2024-10-05"; + version = "0-unstable-2024-10-05"; src = fetchFromGitHub { owner = "flyinghead"; diff --git a/pkgs/applications/emulators/retroarch/cores/fmsx.nix b/pkgs/applications/emulators/retroarch/cores/fmsx.nix index e888ef1e0693..ca320c9df653 100644 --- a/pkgs/applications/emulators/retroarch/cores/fmsx.nix +++ b/pkgs/applications/emulators/retroarch/cores/fmsx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fmsx"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/freeintv.nix b/pkgs/applications/emulators/retroarch/cores/freeintv.nix index a99be9271590..e5486b6a1d03 100644 --- a/pkgs/applications/emulators/retroarch/cores/freeintv.nix +++ b/pkgs/applications/emulators/retroarch/cores/freeintv.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "freeintv"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/fuse.nix b/pkgs/applications/emulators/retroarch/cores/fuse.nix index 1bfd08e81fb0..a4e954ac109f 100644 --- a/pkgs/applications/emulators/retroarch/cores/fuse.nix +++ b/pkgs/applications/emulators/retroarch/cores/fuse.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fuse"; - version = "unstable-2024-09-20"; + version = "0-unstable-2024-09-20"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/gambatte.nix b/pkgs/applications/emulators/retroarch/cores/gambatte.nix index d256b0d5ffaa..90840af74960 100644 --- a/pkgs/applications/emulators/retroarch/cores/gambatte.nix +++ b/pkgs/applications/emulators/retroarch/cores/gambatte.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "gambatte"; - version = "unstable-2024-10-04"; + version = "0-unstable-2024-10-04"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix index 7754df92f19a..caf2d667ba95 100644 --- a/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "unstable-2024-09-18"; + version = "0-unstable-2024-09-18"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/gpsp.nix b/pkgs/applications/emulators/retroarch/cores/gpsp.nix index e51e86e31be9..cd4c55e916c6 100644 --- a/pkgs/applications/emulators/retroarch/cores/gpsp.nix +++ b/pkgs/applications/emulators/retroarch/cores/gpsp.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "gpsp"; - version = "unstable-2024-09-18"; + version = "0-unstable-2024-09-18"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/gw.nix b/pkgs/applications/emulators/retroarch/cores/gw.nix index a13eef2799f5..274bb2dfced4 100644 --- a/pkgs/applications/emulators/retroarch/cores/gw.nix +++ b/pkgs/applications/emulators/retroarch/cores/gw.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "gw"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/handy.nix b/pkgs/applications/emulators/retroarch/cores/handy.nix index 9dd5c58f9fcc..fe046d5eaf38 100644 --- a/pkgs/applications/emulators/retroarch/cores/handy.nix +++ b/pkgs/applications/emulators/retroarch/cores/handy.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "handy"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/hatari.nix b/pkgs/applications/emulators/retroarch/cores/hatari.nix index e1ded94dc175..0daef12b19dd 100644 --- a/pkgs/applications/emulators/retroarch/cores/hatari.nix +++ b/pkgs/applications/emulators/retroarch/cores/hatari.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "hatari"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame.nix b/pkgs/applications/emulators/retroarch/cores/mame.nix index 20a8f8dd5cee..85b034aa599a 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame.nix @@ -9,7 +9,7 @@ }: mkLibretroCore { core = "mame"; - version = "unstable-2024-11-01"; + version = "0-unstable-2024-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2000.nix b/pkgs/applications/emulators/retroarch/cores/mame2000.nix index f9ece98f68f5..fd3448e8cb37 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2000.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2000.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "mame2000"; - version = "unstable-2024-11-01"; + version = "0-unstable-2024-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix b/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix index 048211d985c3..d895438cef5e 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "unstable-2024-11-01"; + version = "0-unstable-2024-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2003.nix b/pkgs/applications/emulators/retroarch/cores/mame2003.nix index 96786a4c1a0e..47b83ea80c5c 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2003.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2003.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mame2003"; - version = "unstable-2024-11-01"; + version = "0-unstable-2024-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2010.nix b/pkgs/applications/emulators/retroarch/cores/mame2010.nix index 529c79b7d9be..52fa54a76408 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2010.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2010.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "mame2010"; - version = "unstable-2024-10-23"; + version = "0-unstable-2024-10-23"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2015.nix b/pkgs/applications/emulators/retroarch/cores/mame2015.nix index 797c7f80e0a3..8096a99a089d 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2015.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2015.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "mame2015"; - version = "unstable-2023-11-01"; + version = "0-unstable-2023-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2016.nix b/pkgs/applications/emulators/retroarch/cores/mame2016.nix index a98b98a7ace0..31e929b7089a 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2016.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2016.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "mame2016"; - version = "unstable-2024-04-06"; + version = "0-unstable-2024-04-06"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/melonds.nix b/pkgs/applications/emulators/retroarch/cores/melonds.nix index a7adaf2fbb3b..59e0676a5594 100644 --- a/pkgs/applications/emulators/retroarch/cores/melonds.nix +++ b/pkgs/applications/emulators/retroarch/cores/melonds.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "melonds"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mesen-s.nix b/pkgs/applications/emulators/retroarch/cores/mesen-s.nix index 5c4ad5996e58..ea349e193621 100644 --- a/pkgs/applications/emulators/retroarch/cores/mesen-s.nix +++ b/pkgs/applications/emulators/retroarch/cores/mesen-s.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mesen-s"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mesen.nix b/pkgs/applications/emulators/retroarch/cores/mesen.nix index 8f75096ff72c..3c6c9bb9399e 100644 --- a/pkgs/applications/emulators/retroarch/cores/mesen.nix +++ b/pkgs/applications/emulators/retroarch/cores/mesen.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mesen"; - version = "unstable-2024-06-09"; + version = "0-unstable-2024-06-09"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/meteor.nix b/pkgs/applications/emulators/retroarch/cores/meteor.nix index c6e656f698af..f1e5b1c55121 100644 --- a/pkgs/applications/emulators/retroarch/cores/meteor.nix +++ b/pkgs/applications/emulators/retroarch/cores/meteor.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "meteor"; - version = "unstable-2020-12-28"; + version = "0-unstable-2020-12-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mgba.nix b/pkgs/applications/emulators/retroarch/cores/mgba.nix index e2f683345740..02bd1e8b837c 100644 --- a/pkgs/applications/emulators/retroarch/cores/mgba.nix +++ b/pkgs/applications/emulators/retroarch/cores/mgba.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mgba"; - version = "unstable-2024-11-12"; + version = "0-unstable-2024-11-12"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mrboom.nix b/pkgs/applications/emulators/retroarch/cores/mrboom.nix index 017c8325df69..dcb6aaecf9ec 100644 --- a/pkgs/applications/emulators/retroarch/cores/mrboom.nix +++ b/pkgs/applications/emulators/retroarch/cores/mrboom.nix @@ -5,7 +5,7 @@ }: mkLibretroCore rec { core = "mrboom"; - version = "unstable-2024-07-01"; + version = "0-unstable-2024-07-01"; src = fetchFromGitHub { owner = "Javanaise"; diff --git a/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix b/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix index 41aff713cba6..bf455e034deb 100644 --- a/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix +++ b/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix @@ -11,7 +11,7 @@ }: mkLibretroCore { core = "mupen64plus-next"; - version = "unstable-2024-10-29"; + version = "0-unstable-2024-10-29"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/neocd.nix b/pkgs/applications/emulators/retroarch/cores/neocd.nix index 17c74d6ab92f..55fce9c5e269 100644 --- a/pkgs/applications/emulators/retroarch/cores/neocd.nix +++ b/pkgs/applications/emulators/retroarch/cores/neocd.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "neocd"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/nestopia.nix b/pkgs/applications/emulators/retroarch/cores/nestopia.nix index 4d881e69b281..0275db2c133e 100644 --- a/pkgs/applications/emulators/retroarch/cores/nestopia.nix +++ b/pkgs/applications/emulators/retroarch/cores/nestopia.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "nestopia"; - version = "unstable-2024-10-17"; + version = "0-unstable-2024-10-17"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/np2kai.nix b/pkgs/applications/emulators/retroarch/cores/np2kai.nix index f840b04327cf..2ca6b2fba9c6 100644 --- a/pkgs/applications/emulators/retroarch/cores/np2kai.nix +++ b/pkgs/applications/emulators/retroarch/cores/np2kai.nix @@ -5,7 +5,7 @@ }: mkLibretroCore rec { core = "np2kai"; - version = "unstable-2024-11-03"; + version = "0-unstable-2024-11-03"; src = fetchFromGitHub { owner = "AZO234"; diff --git a/pkgs/applications/emulators/retroarch/cores/nxengine.nix b/pkgs/applications/emulators/retroarch/cores/nxengine.nix index 6754dd7a3926..c9712892daab 100644 --- a/pkgs/applications/emulators/retroarch/cores/nxengine.nix +++ b/pkgs/applications/emulators/retroarch/cores/nxengine.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "nxengine"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/o2em.nix b/pkgs/applications/emulators/retroarch/cores/o2em.nix index 504deb49a268..e5deb54ea7dd 100644 --- a/pkgs/applications/emulators/retroarch/cores/o2em.nix +++ b/pkgs/applications/emulators/retroarch/cores/o2em.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "o2em"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/opera.nix b/pkgs/applications/emulators/retroarch/cores/opera.nix index 90e273c6d2b3..5b3c12b73f52 100644 --- a/pkgs/applications/emulators/retroarch/cores/opera.nix +++ b/pkgs/applications/emulators/retroarch/cores/opera.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "opera"; - version = "unstable-2024-10-17"; + version = "0-unstable-2024-10-17"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix b/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix index f6ba71d47c63..48ae3d922650 100644 --- a/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix +++ b/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix @@ -9,7 +9,7 @@ }: mkLibretroCore { core = "parallel-n64"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix index 92405ee175b9..d96f80d1ceb0 100644 --- a/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "unstable-2024-11-17"; + version = "0-unstable-2024-11-17"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/pcsx2.nix b/pkgs/applications/emulators/retroarch/cores/pcsx2.nix index d24311b4df62..09a80f4dbe86 100644 --- a/pkgs/applications/emulators/retroarch/cores/pcsx2.nix +++ b/pkgs/applications/emulators/retroarch/cores/pcsx2.nix @@ -17,7 +17,7 @@ }: mkLibretroCore { core = "pcsx2"; - version = "unstable-2023-01-30"; + version = "0-unstable-2023-01-30"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/picodrive.nix b/pkgs/applications/emulators/retroarch/cores/picodrive.nix index 6c5b6e093fe0..7d3b3065e661 100644 --- a/pkgs/applications/emulators/retroarch/cores/picodrive.nix +++ b/pkgs/applications/emulators/retroarch/cores/picodrive.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "picodrive"; - version = "unstable-2024-10-19"; + version = "0-unstable-2024-10-19"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/play.nix b/pkgs/applications/emulators/retroarch/cores/play.nix index 12b3ac2d6ba6..f87380b7e62d 100644 --- a/pkgs/applications/emulators/retroarch/cores/play.nix +++ b/pkgs/applications/emulators/retroarch/cores/play.nix @@ -14,7 +14,7 @@ }: mkLibretroCore { core = "play"; - version = "unstable-2024-10-19"; + version = "0-unstable-2024-10-19"; src = fetchFromGitHub { owner = "jpd002"; diff --git a/pkgs/applications/emulators/retroarch/cores/ppsspp.nix b/pkgs/applications/emulators/retroarch/cores/ppsspp.nix index 78db8a8db409..7339294e0767 100644 --- a/pkgs/applications/emulators/retroarch/cores/ppsspp.nix +++ b/pkgs/applications/emulators/retroarch/cores/ppsspp.nix @@ -13,7 +13,7 @@ }: mkLibretroCore { core = "ppsspp"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "hrydgard"; diff --git a/pkgs/applications/emulators/retroarch/cores/prboom.nix b/pkgs/applications/emulators/retroarch/cores/prboom.nix index b92d3159d729..64d4e28d286f 100644 --- a/pkgs/applications/emulators/retroarch/cores/prboom.nix +++ b/pkgs/applications/emulators/retroarch/cores/prboom.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "prboom"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/prosystem.nix b/pkgs/applications/emulators/retroarch/cores/prosystem.nix index 30aedcb7e346..4e202e6a2bb3 100644 --- a/pkgs/applications/emulators/retroarch/cores/prosystem.nix +++ b/pkgs/applications/emulators/retroarch/cores/prosystem.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "prosystem"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/puae.nix b/pkgs/applications/emulators/retroarch/cores/puae.nix index 9fe0184c36e0..07cc1c006023 100644 --- a/pkgs/applications/emulators/retroarch/cores/puae.nix +++ b/pkgs/applications/emulators/retroarch/cores/puae.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "puae"; - version = "unstable-2024-10-19"; + version = "0-unstable-2024-10-19"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/quicknes.nix b/pkgs/applications/emulators/retroarch/cores/quicknes.nix index 18edd078af28..365a64725c7a 100644 --- a/pkgs/applications/emulators/retroarch/cores/quicknes.nix +++ b/pkgs/applications/emulators/retroarch/cores/quicknes.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "quicknes"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/same_cdi.nix b/pkgs/applications/emulators/retroarch/cores/same_cdi.nix index 365b2c5cefc0..5a9611ac25a9 100644 --- a/pkgs/applications/emulators/retroarch/cores/same_cdi.nix +++ b/pkgs/applications/emulators/retroarch/cores/same_cdi.nix @@ -12,7 +12,7 @@ }: mkLibretroCore { core = "same_cdi"; - version = "unstable-2023-02-28"; + version = "0-unstable-2023-02-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/sameboy.nix b/pkgs/applications/emulators/retroarch/cores/sameboy.nix index 53ffa7b2fe4b..252976e3f85a 100644 --- a/pkgs/applications/emulators/retroarch/cores/sameboy.nix +++ b/pkgs/applications/emulators/retroarch/cores/sameboy.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "sameboy"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/scummvm.nix b/pkgs/applications/emulators/retroarch/cores/scummvm.nix index 6b8cc313913c..6bb0e08778cb 100644 --- a/pkgs/applications/emulators/retroarch/cores/scummvm.nix +++ b/pkgs/applications/emulators/retroarch/cores/scummvm.nix @@ -10,7 +10,7 @@ }: mkLibretroCore { core = "scummvm"; - version = "unstable-2022-04-06"; + version = "0-unstable-2022-04-06"; # This is the old source code before they upstreamed the source code, # so now the libretro related code lives in the scummvm/scummvm repository. diff --git a/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix b/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix index 3eb69a857811..d0e9569bfc77 100644 --- a/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix +++ b/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "smsplus"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x.nix b/pkgs/applications/emulators/retroarch/cores/snes9x.nix index dc51fdfc9d3b..9c977d2a4d08 100644 --- a/pkgs/applications/emulators/retroarch/cores/snes9x.nix +++ b/pkgs/applications/emulators/retroarch/cores/snes9x.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "snes9x"; - version = "unstable-2024-10-28"; + version = "0-unstable-2024-10-28"; src = fetchFromGitHub { owner = "snes9xgit"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix index f64f31641b56..1f76c95869d2 100644 --- a/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "snes9x2002"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix index f823a0fab39a..94e2f2440b18 100644 --- a/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "snes9x2005" + lib.optionalString withBlarggAPU "-plus"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix index 8b913e7fa4a4..a9e1f27911cd 100644 --- a/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix @@ -5,7 +5,7 @@ }: mkLibretroCore rec { core = "snes9x2010"; - version = "unstable-2024-11-18"; + version = "0-unstable-2024-11-18"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/stella.nix b/pkgs/applications/emulators/retroarch/cores/stella.nix index 891127b278fa..d3028ef6926b 100644 --- a/pkgs/applications/emulators/retroarch/cores/stella.nix +++ b/pkgs/applications/emulators/retroarch/cores/stella.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "stella"; - version = "unstable-2024-11-17"; + version = "0-unstable-2024-11-17"; src = fetchFromGitHub { owner = "stella-emu"; diff --git a/pkgs/applications/emulators/retroarch/cores/stella2014.nix b/pkgs/applications/emulators/retroarch/cores/stella2014.nix index 2baf66a65f7b..467f6f82882b 100644 --- a/pkgs/applications/emulators/retroarch/cores/stella2014.nix +++ b/pkgs/applications/emulators/retroarch/cores/stella2014.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "stella2014"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/swanstation.nix b/pkgs/applications/emulators/retroarch/cores/swanstation.nix index aa87dc8178b1..092060008072 100644 --- a/pkgs/applications/emulators/retroarch/cores/swanstation.nix +++ b/pkgs/applications/emulators/retroarch/cores/swanstation.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "swanstation"; - version = "unstable-2024-07-24"; + version = "0-unstable-2024-07-24"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/tgbdual.nix b/pkgs/applications/emulators/retroarch/cores/tgbdual.nix index 7297818539c8..5925125cee29 100644 --- a/pkgs/applications/emulators/retroarch/cores/tgbdual.nix +++ b/pkgs/applications/emulators/retroarch/cores/tgbdual.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "tgbdual"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix b/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix index 2b8358a59803..ae74646706e2 100644 --- a/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix +++ b/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "thepowdertoy"; - version = "unstable-2024-10-01"; + version = "0-unstable-2024-10-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/tic80.nix b/pkgs/applications/emulators/retroarch/cores/tic80.nix index 2e637e9a1e74..8799649b6653 100644 --- a/pkgs/applications/emulators/retroarch/cores/tic80.nix +++ b/pkgs/applications/emulators/retroarch/cores/tic80.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "tic80"; - version = "unstable-2024-05-13"; + version = "0-unstable-2024-05-13"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix b/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix index 23d72dfead1b..5c9c39ac3a08 100644 --- a/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix +++ b/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "2048"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/vba-m.nix b/pkgs/applications/emulators/retroarch/cores/vba-m.nix index 5b50f4d9a094..04b25cbcedca 100644 --- a/pkgs/applications/emulators/retroarch/cores/vba-m.nix +++ b/pkgs/applications/emulators/retroarch/cores/vba-m.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "vbam"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/vba-next.nix b/pkgs/applications/emulators/retroarch/cores/vba-next.nix index 9027d8501565..a0c9ee947e2d 100644 --- a/pkgs/applications/emulators/retroarch/cores/vba-next.nix +++ b/pkgs/applications/emulators/retroarch/cores/vba-next.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "vba-next"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/vecx.nix b/pkgs/applications/emulators/retroarch/cores/vecx.nix index 664f01b73849..0b2871528486 100644 --- a/pkgs/applications/emulators/retroarch/cores/vecx.nix +++ b/pkgs/applications/emulators/retroarch/cores/vecx.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "vecx"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix b/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix index c90c4b081002..60b3ac75dd67 100644 --- a/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix +++ b/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "virtualjaguar"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/yabause.nix b/pkgs/applications/emulators/retroarch/cores/yabause.nix index dec1fe3e89b9..a825ad01c7ce 100644 --- a/pkgs/applications/emulators/retroarch/cores/yabause.nix +++ b/pkgs/applications/emulators/retroarch/cores/yabause.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "yabause"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; From 1757f8a24f1faa89617105513375a8f4315afde7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 22 Nov 2024 13:09:27 +0000 Subject: [PATCH 168/192] graalvmCEPackages: add recurseIntoAttrs to callPackage call --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4bd8afa3cfd..0213fddd0041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6645,7 +6645,7 @@ with pkgs; openjdk = jdk; openjdk_headless = jdk_headless; - graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { }; + graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); graalvm-ce = graalvmCEPackages.graalvm-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { graalvmDrv = graalvm-ce; From c7f43f2d7c9e17af4711cdb40c5a681aebb16e4f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 22 Nov 2024 13:10:49 +0000 Subject: [PATCH 169/192] maintainers/team-list: remove thiagokokada from graalvm-ce --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 613d6be6753a..6251203607a3 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -440,7 +440,6 @@ with lib.maintainers; hlolli glittershark ericdallo - thiagokokada ]; scope = "Maintain GraalVM Community Edition packages."; shortName = "GraalVM-CE"; From ac1dbe26e206bae2c18f2b77fa955fbba6fa9c85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Nov 2024 12:59:47 +0000 Subject: [PATCH 170/192] stu: 0.6.4 -> 0.6.5 --- pkgs/by-name/st/stu/package.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix index 62c6080d6453..f9beb3282a09 100644 --- a/pkgs/by-name/st/stu/package.nix +++ b/pkgs/by-name/st/stu/package.nix @@ -2,31 +2,22 @@ lib, fetchFromGitHub, rustPlatform, - stdenv, - darwin, stu, testers, }: -let - version = "0.6.4"; -in -rustPlatform.buildRustPackage { + +rustPlatform.buildRustPackage rec { pname = "stu"; - inherit version; + version = "0.6.5"; src = fetchFromGitHub { owner = "lusingander"; repo = "stu"; rev = "v${version}"; - hash = "sha256-iLfUJXunQjS/dFB+sTtZRvsxHRMh5o6JYM3eCucEhQA="; + hash = "sha256-GqeKb3Fu0MkM98AGDOEuO3zbzSHOWQFiamCSgMk4xBI="; }; - cargoHash = "sha256-eja2wE822IckT9pj6TqqKh3NUyUox+VlhGb+lTvCW1Y="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreGraphics - ]; + cargoHash = "sha256-fK7eHNUKAE6FykHllnIe0vNEEzeykpqvnM29KBn4l2I="; passthru.tests.version = testers.testVersion { package = stu; }; From b128929035dac96b788dd3262b2a0eec5a56f203 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 19 Nov 2024 00:09:31 +0900 Subject: [PATCH 171/192] nix-init: format with nixfmt-rfc-style --- pkgs/by-name/ni/nix-init/package.nix | 62 +++++++++++++++------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index 54e35a2d9de4..83deac9e230b 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -1,20 +1,21 @@ -{ lib -, writeText -, rustPlatform -, fetchFromGitHub -, curl -, installShellFiles -, pkg-config -, bzip2 -, libgit2 -, openssl -, zlib -, zstd -, stdenv -, darwin -, spdx-license-list-data -, nix -, nurl +{ + lib, + writeText, + rustPlatform, + fetchFromGitHub, + curl, + installShellFiles, + pkg-config, + bzip2, + libgit2, + openssl, + zlib, + zstd, + stdenv, + darwin, + spdx-license-list-data, + nix, + nurl, }: let @@ -44,18 +45,21 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - bzip2 - curl - libgit2 - openssl - zlib - zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = + [ + bzip2 + curl + libgit2 + openssl + zlib + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + darwin.apple_sdk.frameworks.CoreFoundation + ]; buildNoDefaultFeatures = true; From 26cea2436d940e4cda749ccf1e05e53ac8285e9c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 19 Nov 2024 00:11:54 +0900 Subject: [PATCH 172/192] nix-init: add passthru.tests.version --- pkgs/by-name/ni/nix-init/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index 83deac9e230b..510fa3c47c2e 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -16,6 +16,8 @@ spdx-license-list-data, nix, nurl, + testers, + nix-init, }: let @@ -92,6 +94,10 @@ rustPlatform.buildRustPackage rec { ZSTD_SYS_USE_PKG_CONFIG = true; }; + passthru.tests.version = testers.testVersion { + package = nix-init; + }; + meta = with lib; { description = "Command line tool to generate Nix packages from URLs"; mainProgram = "nix-init"; From ee2d6d1ea42554489bebb56e1c2ccc1665c11016 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 22 Nov 2024 21:59:03 +0900 Subject: [PATCH 173/192] nix-init: remove unnecessary darwin sdk nix-init: remove outdated input Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com> --- pkgs/by-name/ni/nix-init/package.nix | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index 510fa3c47c2e..7f5355789016 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -12,7 +12,6 @@ zlib, zstd, stdenv, - darwin, spdx-license-list-data, nix, nurl, @@ -47,21 +46,14 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - curl - libgit2 - openssl - zlib - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = [ + bzip2 + curl + libgit2 + openssl + zlib + zstd + ]; buildNoDefaultFeatures = true; From e4c8127a4f91407dcdd89ffc6f59925441b5e8ce Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Fri, 22 Nov 2024 23:24:12 +0800 Subject: [PATCH 174/192] moonlight-qt: fix build on x86_64-darwin error: no member named 'aligned_alloc' in the global namespace --- pkgs/by-name/mo/moonlight-qt/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix index dc57ce4678f5..323f79d0160c 100644 --- a/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -19,6 +19,7 @@ libxkbcommon, wayland, libdrm, + apple-sdk_11, nix-update-script, }: @@ -69,6 +70,9 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtwayland wayland libdrm + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 ]; qmakeFlags = [ "CONFIG+=disable-prebuilts" ]; From 2995b3825e141887018569a48381b498baef1573 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 17 Nov 2024 19:46:54 +0100 Subject: [PATCH 175/192] nixos/pgbouncer: rework RFC42 integration Commit bfb9d1825d545d96278db84d43e0b2a529775089 added RFC42 support which is a good thing in general, but this implementation has the following flaws: * `services.pgbouncer.logFile` was not renamed to `[...].log_file`, but to `[...].logfile`. Also the use of `mkRenamedOptionModule` is inappropriate here because the two options are not equivalent: the old option took a path relative to the home directory, the new an absolute path. * Using `mkRenamedOptionModule` with options that don't exist (but are keys in a freeform attr-set or an `attrsOf X`), you get the following error when referencing an option you didn't declare: error: evaluation aborted with the following error message: 'Renaming error: option `services.pgbouncer.settings.pgbouncer.listen_port' does not exist.' This error is pretty bad because it's not actionable for an end-user of the module. A possible use-case is doing networking.firewall.allowedTCPPorts = [ config.services.pgbouncer.listenPort ]; without specifying a custom listen port. This is an example of why you want to keep options, they already contain defaults and you can re-use those defaults in other parts of your system configuration. I decided to re-add a bunch of options where I figured that it's either useful to be able to address those in the NixOS configuration or having documentation directly in the options' reference in the NixOS manual. I didn't add all options, I'll leave that to the maintainers of pgbouncer. --- .../modules/services/databases/pgbouncer.nix | 188 +++++++++++++++++- 1 file changed, 184 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/pgbouncer.nix b/nixos/modules/services/databases/pgbouncer.nix index 7eafa502eb0c..36130d66c685 100644 --- a/nixos/modules/services/databases/pgbouncer.nix +++ b/nixos/modules/services/databases/pgbouncer.nix @@ -3,14 +3,20 @@ let cfg = config.services.pgbouncer; settingsFormat = pkgs.formats.ini { }; - configFile = settingsFormat.generate "pgbouncer.ini" cfg.settings; + configFile = settingsFormat.generate "pgbouncer.ini" + (lib.filterAttrsRecursive (_: v: v != null) cfg.settings); configPath = "pgbouncer/pgbouncer.ini"; in { imports = [ - (lib.mkRenamedOptionModule + (lib.mkRemovedOptionModule [ "services" "pgbouncer" "logFile" ] - [ "services" "pgbouncer" "settings" "pgbouncer" "log_file" ]) + '' + `services.pgbouncer.logFile` has been removed, use `services.pgbouncer.settings.pgbouncer.logfile` + instead. + Please note that the new option expects an absolute path + whereas the old option accepted paths relative to pgbouncer's home dir. + '') (lib.mkRenamedOptionModule [ "services" "pgbouncer" "listenAddress" ] [ "services" "pgbouncer" "settings" "pgbouncer" "listen_addr" ]) @@ -128,7 +134,181 @@ in }; settings = lib.mkOption { - type = settingsFormat.type; + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + pgbouncer = { + listen_port = lib.mkOption { + type = lib.types.port; + default = 6432; + description = '' + Which port to listen on. Applies to both TCP and Unix sockets. + ''; + }; + + listen_addr = lib.mkOption { + type = lib.types.nullOr lib.types.commas; + example = "*"; + default = null; + description = '' + Specifies a list (comma-separated) of addresses where to listen for TCP connections. + You may also use * meaning “listen on all addresses”. + When not set, only Unix socket connections are accepted. + + Addresses can be specified numerically (IPv4/IPv6) or by name. + ''; + }; + + pool_mode = lib.mkOption { + type = lib.types.enum [ "session" "transaction" "statement" ]; + default = "session"; + description = '' + Specifies when a server connection can be reused by other clients. + + session + Server is released back to pool after client disconnects. Default. + transaction + Server is released back to pool after transaction finishes. + statement + Server is released back to pool after query finishes. + Transactions spanning multiple statements are disallowed in this mode. + ''; + }; + + max_client_conn = lib.mkOption { + type = lib.types.int; + default = 100; + description = '' + Maximum number of client connections allowed. + + When this setting is increased, then the file descriptor limits in the operating system + might also have to be increased. Note that the number of file descriptors potentially + used is more than maxClientConn. If each user connects under its own user name to the server, + the theoretical maximum used is: + maxClientConn + (max pool_size * total databases * total users) + + If a database user is specified in the connection string (all users connect under the same user name), + the theoretical maximum is: + maxClientConn + (max pool_size * total databases) + + The theoretical maximum should never be reached, unless somebody deliberately crafts a special load for it. + Still, it means you should set the number of file descriptors to a safely high number. + ''; + }; + + default_pool_size = lib.mkOption { + type = lib.types.int; + default = 20; + description = '' + How many server connections to allow per user/database pair. + Can be overridden in the per-database configuration. + ''; + }; + + max_db_connections = lib.mkOption { + type = lib.types.int; + default = 0; + description = '' + Do not allow more than this many server connections per database (regardless of user). + This considers the PgBouncer database that the client has connected to, + not the PostgreSQL database of the outgoing connection. + + This can also be set per database in the [databases] section. + + Note that when you hit the limit, closing a client connection to one pool will + not immediately allow a server connection to be established for another pool, + because the server connection for the first pool is still open. + Once the server connection closes (due to idle timeout), + a new server connection will immediately be opened for the waiting pool. + + 0 = unlimited + ''; + }; + + max_user_connections = lib.mkOption { + type = lib.types.int; + default = 0; + description = '' + Do not allow more than this many server connections per user (regardless of database). + This considers the PgBouncer user that is associated with a pool, + which is either the user specified for the server connection + or in absence of that the user the client has connected as. + + This can also be set per user in the [users] section. + + Note that when you hit the limit, closing a client connection to one pool + will not immediately allow a server connection to be established for another pool, + because the server connection for the first pool is still open. + Once the server connection closes (due to idle timeout), a new server connection + will immediately be opened for the waiting pool. + + 0 = unlimited + ''; + }; + + ignore_startup_parameters = lib.mkOption { + type = lib.types.nullOr lib.types.commas; + example = "extra_float_digits"; + default = null; + description = '' + By default, PgBouncer allows only parameters it can keep track of in startup packets: + client_encoding, datestyle, timezone and standard_conforming_strings. + + All others parameters will raise an error. + To allow others parameters, they can be specified here, so that PgBouncer knows that + they are handled by the admin and it can ignore them. + + If you need to specify multiple values, use a comma-separated list. + + IMPORTANT: When using prometheus-pgbouncer-exporter, you need: + extra_float_digits + + ''; + }; + }; + databases = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = {}; + example = { + exampledb = "host=/run/postgresql/ port=5432 auth_user=exampleuser dbname=exampledb sslmode=require"; + bardb = "host=localhost dbname=bazdb"; + foodb = "host=host1.example.com port=5432"; + }; + description = '' + Detailed information about PostgreSQL database definitions: + + ''; + }; + users = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = {}; + example = { + user1 = "pool_mode=session"; + }; + description = '' + Optional. + + Detailed information about PostgreSQL user definitions: + + ''; + }; + + peers = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = {}; + example = { + "1" = "host=host1.example.com"; + "2" = "host=/tmp/pgbouncer-2 port=5555"; + }; + description = '' + Optional. + + Detailed information about PostgreSQL database definitions: + + ''; + }; + }; + }; default = { }; description = '' Configuration for PgBouncer, see From 97ed6b4565e76286062e6942517a71ae4c9cac72 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 17:26:17 +0100 Subject: [PATCH 176/192] runInLinuxVM: fix for structured attrs Closes #334705 Addresses #205690 The main issue was that the output variable (i.e. `$out` and friends) didn't exist. I figured the easiest way to add those is to source `stdenv` here. Given that we build another derivation in this builder, it's pretty likely that `stdenv` gets pulled already, so I don't expect a real overhead here. Also, this mounts `/build` into the VM: this is required to make sure `.attrs.json` & `.attrs.sh` are available. Dropped the mount of `xchg` into `/tmp` now since it's also part of `/build`. --- pkgs/build-support/vm/default.nix | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7ba67af5cf5a..648fea5cd016 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -130,15 +130,15 @@ rec { mkdir -p /fs${storeDir} mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=131072 + echo "mounting host's build directory..." + mkdir -p /fs/build + mount -t 9p sa /fs/build -o trans=virtio,version=9p2000.L,cache=loose,msize=131072 + mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp mount -t tmpfs -o "mode=755" none /fs/run ln -sfn /run /fs/var/run - echo "mounting host's temporary directory..." - mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=131072 - mkdir -p /fs/proc mount -t proc none /fs/proc @@ -169,7 +169,12 @@ rec { stage2Init = writeScript "vm-run-stage2" '' #! ${bash}/bin/sh - source /tmp/xchg/saved-env + set -euo pipefail + source /build/xchg/saved-env + if [ -f "''${NIX_ATTRS_SH_FILE-}" ]; then + source "$NIX_ATTRS_SH_FILE" + fi + source $stdenv/setup # Set the system time from the hardware clock. Works around an # apparent KVM > 1.5.2 bug. @@ -179,7 +184,6 @@ rec { export NIX_BUILD_TOP=/tmp export TMPDIR=/tmp export PATH=/empty - out="$1" cd "$NIX_BUILD_TOP" if ! test -e /bin/sh; then @@ -203,8 +207,10 @@ rec { if test -n "$origBuilder" -a ! -e /.debug; then exec < /dev/null ${coreutils}/bin/touch /.debug - $origBuilder $origArgs - echo $? > /tmp/xchg/in-vm-exit + declare -a argsArray=() + concatTo argsArray origArgs + "$origBuilder" "''${argsArray[@]}" + echo $? > /build/xchg/in-vm-exit ${busybox}/bin/mount -o remount,ro dummy / @@ -223,11 +229,12 @@ rec { -nographic -no-reboot \ -device virtio-rng-pci \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ + -virtfs local,path=/build,security_model=none,mount_tag=sa \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ - -append "console=${qemu-common.qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ + -append "console=${qemu-common.qemuSerialDevice} panic=1 command=${stage2Init} mountDisk=$mountDisk loglevel=4" \ $QEMU_OPTS ''; @@ -260,8 +267,6 @@ rec { ${qemuCommand} EOF - mkdir -p -m 0700 $out - chmod +x ./run-vm source ./run-vm From 9c6695c525ebc6264197bdfb7a0089c5b1b4fe14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Nov 2024 05:11:03 +0000 Subject: [PATCH 177/192] python312Packages.momepy: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/momepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix index 7d6ffd6ff94d..79292c79c102 100644 --- a/pkgs/development/python-modules/momepy/default.nix +++ b/pkgs/development/python-modules/momepy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "momepy"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pysal"; repo = "momepy"; rev = "refs/tags/v${version}"; - hash = "sha256-9GVX+OaBkLb3Q/RRHbGOlAJ3gu2K+V07ez6v9dWU6JU="; + hash = "sha256-JeAQ0JMvle+63ymbd+wPRpvpxlq9YxwjVElVVyGs0EQ="; }; build-system = [ setuptools-scm ]; From 7426ad0c69a11d88bb00adf981a1903e573760bc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 23 Nov 2024 08:12:15 +0100 Subject: [PATCH 178/192] open-webui: 0.4.3 -> 0.4.4 Diff: https://github.com/open-webui/open-webui/compare/v0.4.3..v0.4.4 Changelog: https://github.com/open-webui/open-webui/releases/tag/v0.4.4 --- pkgs/by-name/op/open-webui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 89ce2edf1547..377732556f7a 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "refs/tags/v${version}"; - hash = "sha256-OVj7yAHN3XMeqTa1oZIxEz9cwt4kW1ng+bwD44y/qQA="; + hash = "sha256-KbU8g9iqz7ow2Yxl5EizcYckMOHGGsEK5HkkchSXxQo="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-qT7oqOZSZjicsFnd7nsnGvW5ifAV16Ah/fPSaKlf7fw="; + npmDepsHash = "sha256-MdftLgmFL5zkScC4XFfjKooQa4PX3il65P9BjfU5mXk="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. From f5a27bfa74ea50887e566b47b2016dd72caebcec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Nov 2024 02:00:59 +0000 Subject: [PATCH 179/192] grails: 6.2.1 -> 6.2.2 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index b2cae35485b1..d4a324d340d6 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-+xwQPd9a7NQcrl0pZNCqktGryLTXXI8V/81a8pk/j48="; + sha256 = "sha256-UPgayFp4CYZzo1yHhII28Bx+CUq+z5E3+yKjXVLSZ0E="; }; nativeBuildInputs = [ unzip ]; From 419a5ca82ff7243e635ea4e0d538a37e573a1277 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Fri, 15 Nov 2024 22:51:04 +0100 Subject: [PATCH 180/192] taizen: fix build --- pkgs/by-name/ta/taizen/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix index 30bb445089f5..01b08de3d4e4 100644 --- a/pkgs/by-name/ta/taizen/package.nix +++ b/pkgs/by-name/ta/taizen/package.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch2 , pkg-config , ncurses , openssl @@ -19,7 +20,16 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pGcD3+3Ds3U8NuNySaDnz0zzAvZlSDte1jRPdM5qrZA="; }; - cargoHash = "sha256-2X9ZhqaQ6Y+mwXTMbvBQWLR24+KYYqjIqQy/8XqGi18="; + cargoPatches = [ + # update cargo dependencies upstreamed: https://github.com/oppiliappan/taizen/pull/27 + (fetchpatch2 { + name = "update-cargo-lock.patch"; + url = "https://github.com/oppiliappan/taizen/commit/104a1663268623e9ded45afaf2fe98c9c42b7b21.patch"; + hash = "sha256-ujsr7MjZWEu+2mijVH1aqtTJXKZC4m5vl73Jre9XHbU="; + }) + ]; + + cargoHash = "sha256-bE7GZOQgAg4XdWCmnicPK4H4Y+T1snISCe/uGjoQATo="; nativeBuildInputs = [ pkg-config ]; From b789043d3d9544579255dbc3b684466184db6ece Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Fri, 22 Nov 2024 12:00:00 +0000 Subject: [PATCH 181/192] vimPlugins.vim-nixhash: 2023-01-09 -> 2024-11-20 fixes the plugins with current version of nix --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 80bd2774d127..fbbcb1b8eba5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -16236,12 +16236,12 @@ final: prev: vim-nixhash = buildVimPlugin { pname = "vim-nixhash"; - version = "2023-01-09"; + version = "2024-11-20"; src = fetchFromGitHub { owner = "symphorien"; repo = "vim-nixhash"; - rev = "71676294bcb22c52d372bd8850b1bd3d7173bfac"; - sha256 = "14chq3c5dhkvllkmrrnpd8lbmlbm8ji1gqxn686bnh0d1w2r9hyk"; + rev = "3b4d3f2742b168decc2281033b9c5c2c700c9ceb"; + sha256 = "04208x1q846ddh61dcdgxylnqxmbkh1vh3qizwq0i5mb55pdrxpc"; }; meta.homepage = "https://github.com/symphorien/vim-nixhash/"; }; From c8610bba9f2fa2f689a2b8cbe8abdbac8227b345 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Thu, 21 Nov 2024 11:21:27 +0000 Subject: [PATCH 182/192] cargo-pgrx_0_12_5: init Additionally, fix broken darwin build for all versions above 0.12.0. --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 019255e59355..36dfda60af89 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -24,14 +24,12 @@ let inherit cargoHash; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security ]; preCheck = '' @@ -60,6 +58,12 @@ in cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk="; }; + cargo-pgrx_0_12_5 = generic { + version = "0.12.5"; + hash = "sha256-U2kF+qjQwMTaocv5f4p5y3qmPUsTzdvAp8mz9cn/COw="; + cargoHash = "sha256-nEgIOBGNG3TupA55/TgoXDPeJzjBjOGGfK+WjrH06VY="; + }; + cargo-pgrx_0_12_6 = generic { version = "0.12.6"; hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2063c9ecfdd..1f816e892c21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6976,6 +6976,7 @@ with pkgs; }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) cargo-pgrx_0_12_0_alpha_1 + cargo-pgrx_0_12_5 cargo-pgrx_0_12_6 ; cargo-pgrx = cargo-pgrx_0_12_6; From dc1e6a5f3e19eadc2599d0c816f7aa403bfedeac Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Thu, 21 Nov 2024 11:23:01 +0000 Subject: [PATCH 183/192] cargo-pgrx: run nixfmt --- .../tools/rust/cargo-pgrx/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 36dfda60af89..48b36e9cb91f 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -1,17 +1,19 @@ -{ lib -, darwin -, fetchCrate -, openssl -, pkg-config -, rustPlatform -, stdenv +{ + lib, + darwin, + fetchCrate, + openssl, + pkg-config, + rustPlatform, + stdenv, }: let generic = - { version - , hash - , cargoHash + { + version, + hash, + cargoHash, }: rustPlatform.buildRustPackage rec { pname = "cargo-pgrx"; From 80e13b103225390342219aef9b6edf5f3b88694a Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Thu, 21 Nov 2024 11:25:15 +0000 Subject: [PATCH 184/192] postgresqlPackages.pgvecto-rs: 0.3.0 -> 0.4.0 --- .../0001-add-rustc-feature-flags.diff | 9 + ...001-read-clang-flags-from-environment.diff | 19 - .../sql/postgresql/ext/pgvecto-rs/Cargo.lock | 3373 ----------------- .../sql/postgresql/ext/pgvecto-rs/default.nix | 36 +- 4 files changed, 20 insertions(+), 3417 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-add-rustc-feature-flags.diff delete mode 100644 pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff delete mode 100644 pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-add-rustc-feature-flags.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-add-rustc-feature-flags.diff new file mode 100644 index 000000000000..5a2a0c57421a --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-add-rustc-feature-flags.diff @@ -0,0 +1,9 @@ +diff --git a/crates/base/src/lib.rs b/crates/base/src/lib.rs +index a303bbb..d776e8b 100644 +--- a/crates/base/src/lib.rs ++++ b/crates/base/src/lib.rs +@@ -1,3 +1,4 @@ ++#![feature(const_float_bits_conv)] + #![feature(avx512_target_feature)] + #![cfg_attr(target_arch = "x86_64", feature(stdarch_x86_avx512))] + #![cfg_attr(target_arch = "x86_64", feature(stdarch_x86_avx512_f16))] diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff deleted file mode 100644 index d05a5cd34e16..000000000000 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/crates/c/build.rs b/crates/c/build.rs -index 8d822e5..8b7e371 100644 ---- a/crates/c/build.rs -+++ b/crates/c/build.rs -@@ -1,9 +1,13 @@ - fn main() { - println!("cargo:rerun-if-changed=src/f16.h"); - println!("cargo:rerun-if-changed=src/f16.c"); -+ println!("cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS"); - cc::Build::new() -- .compiler("clang-16") -+ .compiler("@clang@") - .file("./src/f16.c") -+ // read env var set by rustPlatform.bindgenHook -+ .try_flags_from_environment("BINDGEN_EXTRA_CLANG_ARGS") -+ .expect("the BINDGEN_EXTRA_CLANG_ARGS environment variable must be specified and UTF-8") - .opt_level(3) - .debug(true) - .compile("vectorsc"); diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock deleted file mode 100644 index 52dd4913b5a2..000000000000 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock +++ /dev/null @@ -1,3373 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "async-attributes" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" -dependencies = [ - "async-channel 2.3.1", - "async-executor", - "async-io 2.3.3", - "async-lock 3.4.0", - "blocking", - "futures-lite 2.3.0", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" -dependencies = [ - "async-lock 3.4.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.7.1", - "rustix 0.38.34", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-object-pool" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc" -dependencies = [ - "async-std", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-signal" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa" -dependencies = [ - "async-io 2.3.3", - "async-lock 3.4.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.34", - "signal-hook-registry", - "slab", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-attributes", - "async-channel 1.9.0", - "async-global-executor", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite 1.13.0", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "atomic-traits" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29ec3788e96fb4fdb275ccb9d62811f2fa903d76c5eb4dd6fe7d09a7ed5871f" -dependencies = [ - "cfg-if", - "rustc_version", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base" -version = "0.0.0" -dependencies = [ - "base_macros", - "bytemuck", - "c", - "detect", - "half 2.4.1", - "libc", - "num-traits", - "rand", - "serde", - "thiserror", - "toml", - "uuid", - "validator", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base_macros" -version = "0.0.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "basic-cookies" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7" -dependencies = [ - "lalrpop", - "lalrpop-util", - "regex", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.5.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.66", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel 2.3.1", - "async-task", - "futures-io", - "futures-lite 2.3.0", - "piper", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "c" -version = "0.0.0" -dependencies = [ - "cc", - "detect", - "half 2.4.1", - "rand", -] - -[[package]] -name = "cargo_toml" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be" -dependencies = [ - "serde", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "cee-scape" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d67dfb052149f779f77e9ce089cea126e00657e8f0d11dafc7901fde4291101" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.52.5", -] - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "colorchoice" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "common" -version = "0.0.0" -dependencies = [ - "bytemuck", - "log", - "memmap2", - "rustix 0.38.34", - "serde", - "serde_json", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "darling" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.66", -] - -[[package]] -name = "darling_macro" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "detect" -version = "0.0.0" -dependencies = [ - "detect_macros", - "rustix 0.38.34", -] - -[[package]] -name = "detect_macros" -version = "0.0.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "either" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" - -[[package]] -name = "elkan_k_means" -version = "0.0.0" -dependencies = [ - "base", - "bytemuck", - "common", - "num-traits", - "rand", - "rayon 0.0.0", -] - -[[package]] -name = "embedding" -version = "0.0.0" -dependencies = [ - "httpmock", - "reqwest", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "ena" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" -dependencies = [ - "log", -] - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-map" -version = "2.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" -dependencies = [ - "enum-map-derive", -] - -[[package]] -name = "enum-map-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flat" -version = "0.0.0" -dependencies = [ - "base", - "common", - "quantization", - "rayon 0.0.0", - "storage", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.1.0", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-core", - "futures-io", - "futures-macro", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "bytemuck", - "cfg-if", - "crunchy", - "num-traits", - "rand", - "rand_distr", - "serde", -] - -[[package]] -name = "hash32" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "heapless" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" -dependencies = [ - "hash32", - "stable_deref_trait", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hnsw" -version = "0.0.0" -dependencies = [ - "base", - "bytemuck", - "common", - "parking_lot", - "quantization", - "rayon 0.0.0", - "storage", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "httpmock" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ec9586ee0910472dec1a1f0f8acf52f0fdde93aea74d70d4a3107b4be0fd5b" -dependencies = [ - "assert-json-diff", - "async-object-pool", - "async-std", - "async-trait", - "base64", - "basic-cookies", - "crossbeam-utils", - "form_urlencoded", - "futures-util", - "hyper", - "lazy_static", - "levenshtein", - "log", - "regex", - "serde", - "serde_json", - "serde_regex", - "similar", - "tokio", - "url", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.7", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "index" -version = "0.0.0" -dependencies = [ - "arc-swap", - "base", - "bincode", - "byteorder", - "common", - "crc32fast", - "crossbeam", - "dashmap", - "elkan_k_means", - "flat", - "hnsw", - "ivf", - "log", - "parking_lot", - "quantization", - "rand", - "rayon 0.0.0", - "serde", - "serde_json", - "storage", - "thiserror", - "uuid", - "validator", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "interprocess_atomic_wait" -version = "0.0.0" -dependencies = [ - "libc", - "ulock-sys", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "ivf" -version = "0.0.0" -dependencies = [ - "base", - "common", - "elkan_k_means", - "num-traits", - "quantization", - "rand", - "rayon 0.0.0", - "serde_json", - "storage", -] - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - -[[package]] -name = "lalrpop" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" -dependencies = [ - "ascii-canvas", - "bit-set", - "ena", - "itertools 0.11.0", - "lalrpop-util", - "petgraph", - "pico-args", - "regex", - "regex-syntax", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", - "walkdir", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.5", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.5.0", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -dependencies = [ - "value-bag", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memfd" -version = "0.0.0" -dependencies = [ - "detect", - "rand", - "rustix 0.38.34", -] - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - -[[package]] -name = "object" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" -dependencies = [ - "supports-color", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.5", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pathsearch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da983bc5e582ab17179c190b4b66c7d76c5943a69c6d34df2a2b6bf8a2977b05" -dependencies = [ - "anyhow", - "libc", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pgrx" -version = "0.12.0-alpha.1" -source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" -dependencies = [ - "atomic-traits", - "bitflags 2.5.0", - "bitvec", - "enum-map", - "heapless", - "libc", - "once_cell", - "paste", - "pgrx-macros", - "pgrx-pg-sys", - "pgrx-sql-entity-graph", - "seahash", - "serde", - "serde_cbor", - "serde_json", - "thiserror", - "uuid", -] - -[[package]] -name = "pgrx-macros" -version = "0.12.0-alpha.1" -source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" -dependencies = [ - "pgrx-sql-entity-graph", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "pgrx-pg-config" -version = "0.12.0-alpha.1" -source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" -dependencies = [ - "cargo_toml", - "eyre", - "home", - "owo-colors", - "pathsearch", - "serde", - "serde_json", - "thiserror", - "toml", - "url", -] - -[[package]] -name = "pgrx-pg-sys" -version = "0.12.0-alpha.1" -source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" -dependencies = [ - "bindgen", - "cee-scape", - "clang-sys", - "eyre", - "libc", - "pgrx-macros", - "pgrx-pg-config", - "pgrx-sql-entity-graph", - "proc-macro2", - "quote", - "serde", - "shlex", - "sptr", - "syn 2.0.66", - "walkdir", -] - -[[package]] -name = "pgrx-sql-entity-graph" -version = "0.12.0-alpha.1" -source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" -dependencies = [ - "convert_case", - "eyre", - "petgraph", - "proc-macro2", - "quote", - "syn 2.0.66", - "thiserror", - "unescape", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" -dependencies = [ - "atomic-waker", - "fastrand 2.1.0", - "futures-io", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.3.9", - "pin-project-lite", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quantization" -version = "0.0.0" -dependencies = [ - "base", - "common", - "detect", - "elkan_k_means", - "num-traits", - "rand", - "serde_json", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand", -] - -[[package]] -name = "rayon" -version = "0.0.0" -dependencies = [ - "log", - "rayon 1.10.0", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "send_fd" -version = "0.0.0" -dependencies = [ - "libc", - "log", - "rustix 0.38.34", -] - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half 1.8.3", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_regex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" -dependencies = [ - "regex", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "service" -version = "0.0.0" -dependencies = [ - "arc-swap", - "base", - "common", - "index", - "parking_lot", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "similar" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "storage" -version = "0.0.0" -dependencies = [ - "base", - "common", -] - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "supports-color" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" -dependencies = [ - "atty", - "is_ci", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.7", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "ulock-sys" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ad66e1a230c3dd9e07cf0065e3f6afef1fc270716f2ba419b2ddb19971ccfa" -dependencies = [ - "cty", -] - -[[package]] -name = "unescape" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "validator" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" -dependencies = [ - "idna", - "once_cell", - "regex", - "serde", - "serde_derive", - "serde_json", - "url", - "validator_derive", -] - -[[package]] -name = "validator_derive" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" -dependencies = [ - "darling", - "once_cell", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "value-bag" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" - -[[package]] -name = "vectors" -version = "0.0.0" -dependencies = [ - "arrayvec", - "base", - "bincode", - "bytemuck", - "byteorder", - "chrono", - "csv", - "detect", - "embedding", - "env_logger", - "interprocess_atomic_wait", - "libc", - "log", - "memfd", - "memmap2", - "num-traits", - "paste", - "pgrx", - "rand", - "rustix 0.38.34", - "scopeguard", - "send_fd", - "serde", - "serde_json", - "service", - "thiserror", - "tikv-jemallocator", - "toml", - "validator", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.66", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "winnow" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index f25afda0ca61..0f8d4924cec5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -1,6 +1,6 @@ { lib , buildPgrxExtension -, cargo-pgrx_0_12_0_alpha_1 +, cargo-pgrx_0_12_5 , clang_16 , fetchFromGitHub , nix-update-script @@ -10,13 +10,12 @@ , postgresql , rustPlatform , stdenv -, substituteAll }: let # Upstream only works with clang 16, so we're pinning it here to # avoid future incompatibility. - # See https://docs.pgvecto.rs/developers/development.html#environment, step 4 + # See https://docs.pgvecto.rs/developers/development.html#set-up-development-environment, step 2 clang = clang_16; rustPlatform' = rustPlatform // { bindgenHook = rustPlatform.bindgenHook.override { inherit clang; }; @@ -26,41 +25,31 @@ in (buildPgrxExtension.override { # Upstream only works with a fixed version of cargo-pgrx for each release, # so we're pinning it here to avoid future incompatibility. - # See https://docs.pgvecto.rs/developers/development.html#environment, step 6 - cargo-pgrx = cargo-pgrx_0_12_0_alpha_1; + # See https://docs.pgvecto.rs/developers/development.html#set-up-development-environment, step 5 + cargo-pgrx = cargo-pgrx_0_12_5; rustPlatform = rustPlatform'; }) rec { inherit postgresql; pname = "pgvecto-rs"; - version = "0.3.0"; + version = "0.4.0"; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; patches = [ - # Tell the `c` crate to use the flags from the rust bindgen hook - (substituteAll { - src = ./0001-read-clang-flags-from-environment.diff; - clang = lib.getExe clang; - }) + ./0001-add-rustc-feature-flags.diff ]; src = fetchFromGitHub { owner = "tensorchord"; repo = "pgvecto.rs"; rev = "v${version}"; - hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE="; + hash = "sha256-4qrDWxYBJuQAtYlwU/zXVvX/ItqO26YAU/OHc/NLEUI="; }; - # Package has git dependencies on Cargo.lock (instead of just crate.io dependencies), - # so cargoHash does not work, therefore we have to include Cargo.lock in nixpkgs. - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "pgrx-0.12.0-alpha.1" = "sha256-HSQrAR9DFJsi4ZF4hLiJ1sIy+M9Ygva2+WxeUzflOLk="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-cyXKfkLju0hZe7IdNQ50AhhaEFtj795iaRutiQRuwZc="; # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL postPatch = '' @@ -68,7 +57,7 @@ in ''; # Include upgrade scripts in the final package - # https://github.com/tensorchord/pgvecto.rs/blob/v0.2.0/scripts/ci_package.sh#L6-L8 + # https://github.com/tensorchord/pgvecto.rs/blob/v0.4.0/scripts/package.sh#L15 postInstall = '' cp sql/upgrade/* $out/share/postgresql/extension/ ''; @@ -91,10 +80,7 @@ in meta = with lib; { # Upstream removed support for PostgreSQL 12 and 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 - broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14") || - # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607 - # Check after next package update. - versionAtLeast postgresql.version "17" && version == "0.3.0"; + broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14"); description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; homepage = "https://github.com/tensorchord/pgvecto.rs"; license = licenses.asl20; From 03a3e2acec4a2837d7b66ed564b511592b3ee2cd Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 22 Nov 2024 11:10:06 +0000 Subject: [PATCH 185/192] postgresqlPackages.pgvecto-rs: run nixfmt --- .../sql/postgresql/ext/pgvecto-rs/default.nix | 123 +++++++++--------- 1 file changed, 64 insertions(+), 59 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index 0f8d4924cec5..829de024e636 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPgrxExtension -, cargo-pgrx_0_12_5 -, clang_16 -, fetchFromGitHub -, nix-update-script -, nixosTests -, openssl -, pkg-config -, postgresql -, rustPlatform -, stdenv +{ + lib, + buildPgrxExtension, + cargo-pgrx_0_12_5, + clang_16, + fetchFromGitHub, + nix-update-script, + nixosTests, + openssl, + pkg-config, + postgresql, + rustPlatform, + stdenv, }: let @@ -28,62 +29,66 @@ in # See https://docs.pgvecto.rs/developers/development.html#set-up-development-environment, step 5 cargo-pgrx = cargo-pgrx_0_12_5; rustPlatform = rustPlatform'; -}) rec { - inherit postgresql; +}) + rec { + inherit postgresql; - pname = "pgvecto-rs"; - version = "0.4.0"; + pname = "pgvecto-rs"; + version = "0.4.0"; - buildInputs = [ openssl ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; - patches = [ - ./0001-add-rustc-feature-flags.diff - ]; + patches = [ + ./0001-add-rustc-feature-flags.diff + ]; - src = fetchFromGitHub { - owner = "tensorchord"; - repo = "pgvecto.rs"; - rev = "v${version}"; - hash = "sha256-4qrDWxYBJuQAtYlwU/zXVvX/ItqO26YAU/OHc/NLEUI="; - }; + src = fetchFromGitHub { + owner = "tensorchord"; + repo = "pgvecto.rs"; + rev = "v${version}"; + hash = "sha256-4qrDWxYBJuQAtYlwU/zXVvX/ItqO26YAU/OHc/NLEUI="; + }; - useFetchCargoVendor = true; - cargoHash = "sha256-cyXKfkLju0hZe7IdNQ50AhhaEFtj795iaRutiQRuwZc="; + useFetchCargoVendor = true; + cargoHash = "sha256-cyXKfkLju0hZe7IdNQ50AhhaEFtj795iaRutiQRuwZc="; - # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL - postPatch = '' - substituteInPlace ./vectors.control --subst-var-by CARGO_VERSION ${version} - ''; + # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL + postPatch = '' + substituteInPlace ./vectors.control --subst-var-by CARGO_VERSION ${version} + ''; - # Include upgrade scripts in the final package - # https://github.com/tensorchord/pgvecto.rs/blob/v0.4.0/scripts/package.sh#L15 - postInstall = '' - cp sql/upgrade/* $out/share/postgresql/extension/ - ''; + # Include upgrade scripts in the final package + # https://github.com/tensorchord/pgvecto.rs/blob/v0.4.0/scripts/package.sh#L15 + postInstall = '' + cp sql/upgrade/* $out/share/postgresql/extension/ + ''; - env = { - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; + env = { + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; - # Bypass rust nightly features not being available on rust stable - RUSTC_BOOTSTRAP = 1; - }; + # Bypass rust nightly features not being available on rust stable + RUSTC_BOOTSTRAP = 1; + }; - # This crate does not have the "pg_test" feature - usePgTestCheckFeature = false; + # This crate does not have the "pg_test" feature + usePgTestCheckFeature = false; - passthru = { - updateScript = nix-update-script { }; - tests = nixosTests.postgresql.pgvecto-rs.passthru.override postgresql; - }; + passthru = { + updateScript = nix-update-script { }; + tests = nixosTests.postgresql.pgvecto-rs.passthru.override postgresql; + }; - meta = with lib; { - # Upstream removed support for PostgreSQL 12 and 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 - broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14"); - description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; - homepage = "https://github.com/tensorchord/pgvecto.rs"; - license = licenses.asl20; - maintainers = with maintainers; [ diogotcorreia esclear ]; - }; -} + meta = with lib; { + # Upstream removed support for PostgreSQL 12 and 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 + broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14"); + description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; + homepage = "https://github.com/tensorchord/pgvecto.rs"; + license = licenses.asl20; + maintainers = with maintainers; [ + diogotcorreia + esclear + ]; + }; + } From b468a08276b1e2709168a4d8f04c63360c2140a9 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Thu, 21 Nov 2024 11:25:45 +0000 Subject: [PATCH 186/192] cargo-pgrx_0_12_0_alpha_1: remove Used previously for pgvecto-rs 0.3.0, which has now been upgraded to 0.4.0, thus this is no longer needed. --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 48b36e9cb91f..49fd92aefe0f 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -54,12 +54,6 @@ let }; in { - cargo-pgrx_0_12_0_alpha_1 = generic { - version = "0.12.0-alpha.1"; - hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; - cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk="; - }; - cargo-pgrx_0_12_5 = generic { version = "0.12.5"; hash = "sha256-U2kF+qjQwMTaocv5f4p5y3qmPUsTzdvAp8mz9cn/COw="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f816e892c21..ac1ab33adaeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6975,7 +6975,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration; }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) - cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_5 cargo-pgrx_0_12_6 ; From 2ca6859d93e8e121c18c61b9ac1453177639a106 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Nov 2024 10:02:46 +0000 Subject: [PATCH 187/192] curtail: 1.11.0 -> 1.11.1 --- pkgs/by-name/cu/curtail/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/curtail/package.nix b/pkgs/by-name/cu/curtail/package.nix index 88f0a64df13a..591394d76a06 100644 --- a/pkgs/by-name/cu/curtail/package.nix +++ b/pkgs/by-name/cu/curtail/package.nix @@ -20,14 +20,14 @@ python3.pkgs.buildPythonApplication rec { pname = "curtail"; - version = "1.11.0"; + version = "1.11.1"; format = "other"; src = fetchFromGitHub { owner = "Huluti"; repo = "Curtail"; rev = "refs/tags/${version}"; - sha256 = "sha256-bN901v2M644EN7tBKN9/kv12AE2XuIPjDSCoohfevFI="; + sha256 = "sha256-IpN1NMIT13icYnflkcZW+aSzw0Nau8UIOP38Kzji3bg="; }; nativeBuildInputs = [ From acbc72187c713070339a1b220bea3558b558d8e1 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 19:42:48 +0800 Subject: [PATCH 188/192] libkazv: pin to libcpr_1_10_5 --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df20c08d69d0..c4a9ce62284e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19140,6 +19140,10 @@ with pkgs; ffmpeg = ffmpeg_6; }; + libkazv = callPackage ../by-name/li/libkazv/package.nix { + libcpr = libcpr_1_10_5; + }; + tree-from-tags = callPackage ../by-name/tr/tree-from-tags/package.nix { ruby = ruby_3_1; }; From 4d1d9e9ba090a85d0004beda97b5e321acc6d326 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 15 Nov 2024 18:21:13 +0800 Subject: [PATCH 189/192] python3Packages.mdp: drop --- .../python-modules/mdp/default.nix | 68 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/development/python-modules/mdp/default.nix diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix deleted file mode 100644 index 69102cddcd3f..000000000000 --- a/pkgs/development/python-modules/mdp/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - future, - joblib, - numpy, - pytest, - pythonOlder, - scikit-learn, -}: - -buildPythonPackage rec { - pname = "mdp"; - version = "3.6"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "MDP"; - inherit version; - hash = "sha256-rFKmUsy67RhX/xIJhi8Dv5sG0JOxJgb7QQeH2jqmWg4="; - }; - - postPatch = '' - # https://github.com/mdp-toolkit/mdp-toolkit/issues/92 - substituteInPlace mdp/utils/routines.py \ - --replace numx.typeDict numx.sctypeDict - substituteInPlace mdp/test/test_NormalizingRecursiveExpansionNode.py \ - --replace py.test"" "pytest" - substituteInPlace mdp/test/test_RecursiveExpansionNode.py \ - --replace py.test"" "pytest" - ''; - - propagatedBuildInputs = [ - future - numpy - ]; - - nativeCheckInputs = [ - joblib - pytest - scikit-learn - ]; - - pythonImportsCheck = [ - "mdp" - "bimdp" - ]; - - checkPhase = '' - runHook preCheck - - pytest --seed 7710873 mdp - pytest --seed 7710873 bimdp - - runHook postCheck - ''; - - meta = with lib; { - description = "Library for building complex data processing software by combining widely used machine learning algorithms"; - homepage = "https://mdp-toolkit.github.io/"; - changelog = "https://github.com/mdp-toolkit/mdp-toolkit/blob/MDP-${version}/CHANGES"; - license = licenses.bsd3; - maintainers = with maintainers; [ nico202 ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 98f605fa667b..1ecd2a8fa8f0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -336,6 +336,7 @@ mapAliases ({ mask-rcnn = throw "mask-rcnn has been removed as it is unmaintained and its dependency imgaug no longer builds"; # added 2023-07-10 mac_alias = mac-alias; # added 2024-01-07 MDP = mdp; # added 2023-02-19 + mdp = throw "mdp has been removed as it is unmaintained and broken"; # added 2024-11-23 MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27e56d5cfedb..c4cd60b6fad7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7925,8 +7925,6 @@ self: super: with self; { mdutils = callPackage ../development/python-modules/mdutils { }; - mdp = callPackage ../development/python-modules/mdp { }; - mean-average-precision = callPackage ../development/python-modules/mean-average-precision { }; measurement = callPackage ../development/python-modules/measurement { }; From e8e41d6f23dc70de6312d0e03d1bab3edfa3727e Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 23 Nov 2024 11:43:47 +0100 Subject: [PATCH 190/192] offpunk: 2.3 -> 2.4 --- pkgs/by-name/of/offpunk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/of/offpunk/package.nix b/pkgs/by-name/of/offpunk/package.nix index 5c107df67eba..d621dd75e359 100644 --- a/pkgs/by-name/of/offpunk/package.nix +++ b/pkgs/by-name/of/offpunk/package.nix @@ -32,7 +32,7 @@ let in python3Packages.buildPythonApplication rec { pname = "offpunk"; - version = "2.3"; + version = "2.4"; pyproject = true; disabled = python3Packages.pythonOlder "3.7"; @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { owner = "~lioploum"; repo = "offpunk"; rev = "v${version}"; - hash = "sha256-Tiby+JjPc7eFQKziQFUdqcNgx9UhU4GNeRcI/aAzcvk="; + hash = "sha256-ttR8S7FQQs8DkgAEvTIhuQ5zZrHtovy2W8TOw0xhSGk="; }; nativeBuildInputs = [ python3Packages.hatchling installShellFiles ]; From 73c54cb3171b79e261a32ab2c5ca4be9b5eaed23 Mon Sep 17 00:00:00 2001 From: Vieta <94648307+yVieta@users.noreply.github.com> Date: Tue, 5 Nov 2024 17:49:27 +0100 Subject: [PATCH 191/192] maintainers: add vieta --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1409fb743964..9d3ece29147d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21451,6 +21451,12 @@ githubId = 11413574; name = "Fiona Weber"; }; + vieta = { + email = "xyzVieta@gmail.com"; + github = "yVieta"; + githubId = 94648307; + name = "Thanh Viet Nguyen"; + }; vifino = { email = "vifino@tty.sh"; github = "vifino"; From 90190ac71c30d588983fe3c5c846854da925c00e Mon Sep 17 00:00:00 2001 From: Vieta <94648307+yVieta@users.noreply.github.com> Date: Wed, 6 Nov 2024 13:01:08 +0100 Subject: [PATCH 192/192] mercury: add vieta to maintainers Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/development/compilers/mercury/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index d2e15dc6fc23..235915f19a5e 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { changelog = "https://dl.mercurylang.org/release/release-notes-${version}.html"; license = lib.licenses.gpl2Only; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ vieta ]; }; }