diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8e642588d44..1f6d48f20d00 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9390,6 +9390,12 @@ githubId = 1222539; name = "Roman Naumann"; }; + naphta = { + email = "naphta@noreply.github.com"; + github = "naphta"; + githubId = 6709831; + name = "Jake Hill"; + }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a43b3eb41412..a8e66897a683 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -363,6 +363,17 @@ with lib.maintainers; { shortName = "Kodi"; }; + libretro = { + members = [ + aanderse + edwtjo + MP2E + thiagokokada + ]; + scope = "Maintain Libretro, RetroArch and related packages."; + shortName = "Libretro"; + }; + linux-kernel = { members = [ TredwellGit diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index e843214f8552..03f94c426cb0 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -372,6 +372,8 @@ in { "/etc/os-release".source = config.boot.initrd.osRelease; "/etc/initrd-release".source = config.boot.initrd.osRelease; + } // optionalAttrs (config.environment.etc ? "modprobe.d/nixos.conf") { + "/etc/modprobe.d/nixos.conf".source = config.environment.etc."modprobe.d/nixos.conf".source; }; storePaths = [ diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8ec73cc05c86..21d8fa597532 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -597,6 +597,7 @@ in { systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix {}; systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix {}; systemd-initrd-luks-password = handleTest ./systemd-initrd-luks-password.nix {}; + systemd-initrd-modprobe = handleTest ./systemd-initrd-modprobe.nix {}; systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; }; systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix {}; systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix {}; diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index c506ed02da89..f4bf232ea725 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "retroarch"; - meta = with pkgs.lib.maintainers; { maintainers = [ j0hax ]; }; + meta = with pkgs.lib; { maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; }; nodes.machine = { ... }: @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ... }: services.xserver.enable = true; services.xserver.desktopManager.retroarch = { enable = true; - package = pkgs.retroarchFull; + package = pkgs.retroarchBare; }; services.xserver.displayManager = { sddm.enable = true; diff --git a/nixos/tests/systemd-initrd-modprobe.nix b/nixos/tests/systemd-initrd-modprobe.nix new file mode 100644 index 000000000000..bf635a10d0e9 --- /dev/null +++ b/nixos/tests/systemd-initrd-modprobe.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "systemd-initrd-modprobe"; + + nodes.machine = { pkgs, ... }: { + boot.initrd.systemd.enable = true; + boot.initrd.kernelModules = [ "loop" ]; # Load module in initrd. + boot.extraModprobeConfig = '' + options loop max_loop=42 + ''; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") + assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" + ''; +}) diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 1692a81c3d6c..2e482cdf7df5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -167,7 +167,7 @@ let rtpPath = "."; vimFarm = prefix: name: drvs: - let mkEntryFromDrv = drv: { name = "${prefix}/${drv.pname}"; path = drv; }; + let mkEntryFromDrv = drv: { name = "${prefix}/${lib.getName drv}"; path = drv; }; in linkFarm name (map mkEntryFromDrv drvs); /* Generates a packpath folder as expected by vim diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ed47c579d642..0052212ec691 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -8,7 +8,6 @@ , fetchFromGitHub , ffmpeg , fluidsynth -, gcc10Stdenv , gettext , hexdump , hidapi @@ -31,7 +30,6 @@ , portaudio , python3 , retroarch -, SDL , sfml , snappy , udev @@ -40,6 +38,7 @@ , xxd , xz , zlib +, fetchpatch }: let @@ -56,7 +55,7 @@ let , stdenvOverride ? stdenv , src ? (getCoreSrc core) , broken ? false - , version ? "unstable-2022-04-21" + , version ? "unstable-2022-10-01" , platforms ? retroarch.meta.platforms # The resulting core file is based on core name # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename @@ -113,7 +112,7 @@ let meta = with lib; { inherit broken description license platforms; homepage = "https://www.libretro.com/"; - maintainers = with maintainers; [ edwtjo hrdinka MP2E thiagokokada ]; + maintainers = with maintainers; teams.libretro.members ++ [ hrdinka ]; }; }) // builtins.removeAttrs args [ "core" "src" "description" "license" "makeFlags" ] ); @@ -233,6 +232,7 @@ in core = "blastem"; description = "Port of BlastEm to libretro"; license = lib.licenses.gpl3Only; + platforms = lib.platforms.x86; }; bluemsx = mkLibRetroCore { @@ -300,7 +300,6 @@ in citra = mkLibRetroCore { core = "citra"; description = "Port of Citra to libretro"; - stdenvOverride = gcc10Stdenv; license = lib.licenses.gpl2Plus; extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ]; makefile = "Makefile"; @@ -331,7 +330,6 @@ in core = "dolphin"; description = "Port of Dolphin to libretro"; license = lib.licenses.gpl2Plus; - extraNativeBuildInputs = [ cmake curl pkg-config ]; extraBuildInputs = [ libGLU @@ -359,7 +357,7 @@ in core = "dosbox"; description = "Port of DOSBox to libretro"; license = lib.licenses.gpl2Only; - stdenvOverride = gcc10Stdenv; + CXXFLAGS = "-std=gnu++11"; }; eightyone = mkLibRetroCore { @@ -397,7 +395,8 @@ in license = lib.licenses.gpl2Only; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; - makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + patches = [ ./fix-flycast-makefile.patch ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; @@ -452,9 +451,9 @@ in core = "hatari"; description = "Port of Hatari to libretro"; license = lib.licenses.gpl2Only; - extraBuildInputs = [ SDL zlib ]; extraNativeBuildInputs = [ which ]; dontConfigure = true; + # zlib is already included in mkLibRetroCore as buildInputs makeFlags = [ "EXTERNAL_ZLIB=1" ]; }; @@ -467,41 +466,37 @@ in mame2000 = mkLibRetroCore { core = "mame2000"; - description = "Port of MAME ~2000 to libretro"; + description = "Port of MAME ~2000 to libretro, compatible with MAME 0.37b5 sets"; license = "MAME"; makefile = "Makefile"; makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; - enableParallelBuilding = false; }; mame2003 = mkLibRetroCore { core = "mame2003"; - description = "Port of MAME ~2003 to libretro"; + description = "Port of MAME ~2003 to libretro, compatible with MAME 0.78 sets"; license = "MAME"; makefile = "Makefile"; - enableParallelBuilding = false; }; mame2003-plus = mkLibRetroCore { core = "mame2003-plus"; - description = "Port of MAME ~2003+ to libretro"; + description = "Port of MAME ~2003+ to libretro, compatible with MAME 0.78 sets"; license = "MAME"; makefile = "Makefile"; - enableParallelBuilding = false; }; mame2010 = mkLibRetroCore { core = "mame2010"; - description = "Port of MAME ~2010 to libretro"; + description = "Port of MAME ~2010 to libretro, compatible with MAME 0.139 sets"; license = "MAME"; makefile = "Makefile"; makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; - enableParallelBuilding = false; }; mame2015 = mkLibRetroCore { core = "mame2015"; - description = "Port of MAME ~2015 to libretro"; + description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets"; license = "MAME"; makeFlags = [ "PYTHON=python3" ]; extraNativeBuildInputs = [ python3 ]; @@ -512,16 +507,11 @@ in mame2016 = mkLibRetroCore { core = "mame2016"; - description = "Port of MAME ~2016 to libretro"; + description = "Port of MAME ~2016 to libretro, compatible with MAME 0.174 sets"; license = with lib.licenses; [ bsd3 gpl2Plus ]; extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; - postPatch = '' - # Prevent the failure during the parallel building of: - # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o - mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src - ''; enableParallelBuilding = false; }; @@ -666,7 +656,7 @@ in platforms = lib.platforms.x86; }; - pcsx_rearmed = mkLibRetroCore { + pcsx-rearmed = mkLibRetroCore { core = "pcsx_rearmed"; description = "Port of PCSX ReARMed with GNU lightning to libretro"; license = lib.licenses.gpl2Only; @@ -677,11 +667,7 @@ in core = "picodrive"; description = "Fast MegaDrive/MegaCD/32X emulator"; license = "MAME"; - - extraBuildInputs = [ libpng SDL ]; - SDL_CONFIG = "${lib.getDev SDL}/bin/sdl-config"; - dontAddPrefix = true; - configurePlatforms = [ ]; + dontConfigure = true; makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; }; @@ -727,6 +713,17 @@ in makefile = "Makefile"; }; + puae = mkLibRetroCore { + core = "puae"; + description = "Amiga emulator based on WinUAE"; + license = lib.licenses.gpl2Only; + makefile = "Makefile"; + patches = fetchpatch { + url = "https://github.com/libretro/libretro-uae/commit/90ba4c9bb940e566781c3590553270ad69cf212e.patch"; + sha256 = "sha256-9xkRravvyFZc0xsIj0OSm2ux5BqYogfQ1TDnH9l6jKw="; + }; + }; + quicknes = mkLibRetroCore { core = "quicknes"; description = "QuickNES libretro port"; @@ -747,7 +744,7 @@ in core = "scummvm"; description = "Libretro port of ScummVM"; license = lib.licenses.gpl2Only; - extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ]; + extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ]; makefile = "Makefile"; preConfigure = "cd backends/platform/libretro/build"; }; @@ -800,9 +797,8 @@ in core = "stella"; description = "Port of Stella to libretro"; license = lib.licenses.gpl2Only; - extraBuildInputs = [ libpng pkg-config SDL ]; makefile = "Makefile"; - preBuild = "cd src/libretro"; + preBuild = "cd src/os/libretro"; dontConfigure = true; }; @@ -844,7 +840,7 @@ in core = "tic80"; description = "Port of TIC-80 to libretro"; license = lib.licenses.mit; - extraNativeBuildInputs = [ cmake pkg-config libGL libGLU ]; + extraNativeBuildInputs = [ cmake pkg-config ]; makefile = "Makefile"; cmakeFlags = [ "-DBUILD_LIBRETRO=ON" diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 4a8c762b6a93..2e929debc34b 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, nixosTests , enableNvidiaCgToolkit ? false , withGamemode ? stdenv.isLinux , withVulkan ? stdenv.isLinux @@ -36,11 +37,11 @@ }: let - version = "1.10.3"; + version = "1.11.0"; libretroCoreInfo = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - sha256 = "sha256-wIIMEWrria8bZe/rcoJwDA9aCMWwbkDQFyEU80TZXFQ="; + sha256 = "sha256-46T87BpzWUQHD7CsCF2sZo065Sl8Y4Sj1zwzBWmCiiU="; rev = "v${version}"; }; runtimeLibs = lib.optional withVulkan vulkan-loader @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "sha256-nAv1yv0laqlOmB8UUkK5wSYy/ySqXloEErm+yV30bbA="; + sha256 = "sha256-/rOf85TQTXbY9kIETaO5E58f2ZvKPqEFLsbNne/+/lw="; rev = "v${version}"; }; @@ -135,12 +136,14 @@ stdenv.mkDerivation rec { # https://github.com/libretro/RetroArch/issues/14025 ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; + passthru.tests = nixosTests.retroarch; + meta = with lib; { homepage = "https://libretro.com"; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3Plus; platforms = platforms.unix; changelog = "https://github.com/libretro/RetroArch/blob/v${version}/CHANGES.md"; - maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ]; + maintainers = with maintainers; teams.libretro.members ++ [ matthewbauer kolbycrouch ]; }; } diff --git a/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch new file mode 100644 index 000000000000..a067839c7c32 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index 01d99c30..8c2dd248 100644 +--- a/Makefile ++++ b/Makefile +@@ -440,7 +440,6 @@ else ifeq ($(platform), arm64) + CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers + CFLAGS += $(CPUFLAGS) + CXXFLAGS += $(CPUFLAGS) +- ASFLAGS += $(CFLAGS) -c -frename-registers -fno-strict-aliasing -ffast-math -ftree-vectorize + PLATFORM_EXT := unix + WITH_DYNAREC=arm64 + HAVE_GENERIC_JIT = 0 diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 41649cbf4c00..71eec60faf0e 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -2,8 +2,8 @@ "atari800": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "beab30e7ea10b7ed14d0514064f47d16f76cd995", - "sha256": "r9MsnasNhhYdFyr2VHJXkTXssB5U00JW6wN/+i+SNUk=" + "rev": "94033288b026fe699bc50703609807aa8075f4dd", + "sha256": "fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI=" }, "beetle-gba": { "owner": "libretro", @@ -14,38 +14,38 @@ "beetle-lynx": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "de0d520d679cb92767876d4e98da908b1ea6a2d6", - "sha256": "BszU5bnlHBOwQSZOM9P4WIP863rS5RluNWvGBFxqzYs=" + "rev": "3d2fcc5a555bea748b76f92a082c40227dff8222", + "sha256": "PpFLi9DIvv8igtAqDPkLfH1CjkbeOumcpNCP7K9C1PY=" }, "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "facf8e1f5440c5d289258ee3c483710f3bf916fb", - "sha256": "vDKDt7MvCB9XQYP291cwcEPDxfNIVgNSWtBYz9PVgcw=" + "rev": "00c7cb8ea97ad9a372307405d8abf34e401fec8a", + "sha256": "MtZMPjgT4dQy+E+4jSDE08PRi0pwa+q48kmTHhfIQMY=" }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "e8801687f232a6f8828b3ff5dadbc9fe1b0076fc", - "sha256": "YM+URLnMqsdmk/5yqCg8U4mPpgtmj5qne2CrbTpTeN8=" + "rev": "cc248db4d2f47d0f255fbc1a3c651df4beb3d835", + "sha256": "euoNldhyEPfC9EgEX201mpSjns2qbCIAow0zmMKTnaE=" }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "bfc0954e14b261a04dcf8dbe0df8798f16ae3f3c", - "sha256": "XzCb1lZFYgsg+3eQ1OqyycNxCgLtZFA30rno3ytdnoM=" + "rev": "08632fcbc039f70dbd6da5810db9dcc304d7fbde", + "sha256": "G+OUs6k8dwH4BK+0X/g47wbY7Dpb3lT5TslLwPWq6g4=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "5a24d54d30dd00d817d267cf92fd5b3f4640928f", - "sha256": "uG1BhElNW75PnfM+rEYfbl97iwRT89hnl84yvlgx6fg=" + "rev": "bd6b9ef3049fe3f70a18ee6f752a935ae83c2f2b", + "sha256": "CXcLMOF6IXUrp14nyTQ5KK2LR+FyWcF0UcvHTxEVSo0=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "dd18f9c477106263b3b7b050f4970d331ff7b23a", - "sha256": "RN5dmORtNOjIklSz/n11lz37bZ4IcPD7cyRcBGS4Oi8=" + "rev": "054862a4ccb9b2f1bad9e5b075fc3d1116dc8055", + "sha256": "oL9YPvDGkUs0Tm/rNznnV+Tg5mcvqs1VcGVmz/fDHmw=" }, "beetle-snes": { "owner": "libretro", @@ -56,63 +56,63 @@ "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "59991a98c232b1a8350a9d67ac554c5b22771d3c", - "sha256": "zv3dAPWrj6hkNaFQ5vUKm5Orcrb2XO48WSkAFiAVUO0=" + "rev": "3cfafe8c684a2f4f4532bcf18e25d2f8760ca45d", + "sha256": "hIBUMpXgX5zPi/W1vAhkuxprGfZQ/K5ZrtiswV36EMQ=" }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "246555f8ed7e0b9e5748b2ee2ed6743187c61393", - "sha256": "96lQlDqx2bvFeovqGGkemxqS2zlHw92O6YeTEGlgf34=" + "rev": "162918f06d9a705330b2ba128e0d3b65fd1a1bcc", + "sha256": "BtrdDob+B5g8Lq93LUhF7E0uWFUIMZneWFgH0VcsgPE=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "d1fb3f399a2bc16b9ad0f2e8c8ba9f7051cd26bd", - "sha256": "p9mJv7zBFjNh1sh5iAjBZzxP6k8ydUNDXLQIjHl9doQ=" + "rev": "16d96f64a32cbe1fa89c40b142298dbd007f2f4d", + "sha256": "LBtOQfVvP70OB6qMnFXtWdJUu7CkkMfSQ0iPGhe7xeI=" }, "blastem": { "owner": "libretro", "repo": "blastem", - "rev": "0786858437ed71996f43b7af0fbe627eb88152fc", - "sha256": "uEP5hSgLAle1cLv/EM7D11TJMAggu7pqWxfrUt3rhEg=" + "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", + "sha256": "EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=" }, "bluemsx": { "owner": "libretro", "repo": "bluemsx-libretro", - "rev": "92d0c41b4973854114c7b2d06ab727a266d404c5", - "sha256": "dL4k+zG8L4KK4lwf9eXPVGk/u5xQn2htIEpoKyj9kQI=" + "rev": "acf358be18644a9df0ed9602d63c2f73d4fe605a", + "sha256": "K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg=" }, "bsnes": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "26c583e1c5d09253b6c61e2b9d418e8758eef632", - "sha256": "Qa0ScFHcEgBUoWouNoW4JINZ2aHjNATndxhcwKw476Q=" + "rev": "7679cb9618c37c9044158d5cf3da28ef25afa9af", + "sha256": "9ozzXvCAuafcZn9iq91tTq16e2mlYqjwauJUGSbFd+k=" }, "bsnes-hd": { "owner": "DerKoun", "repo": "bsnes-hd", - "rev": "65f24e56c37f46bb752190024bd4058e64ad77d1", - "sha256": "1dk2i71NOLeTTOZjVll8wrkr5dIH5bGSGUeeHqWjZHE=" + "rev": "04821703aefdc909a4fd66d168433fcac06c2ba7", + "sha256": "QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU=" }, "bsnes-mercury": { "owner": "libretro", "repo": "bsnes-mercury", - "rev": "4ba6d8d88e57d3193d95e1bcf39e8d31121f76d4", - "sha256": "w2MVslgRlxW4SMzgcXP4gXr9A8B07N7LNrB1LXzk1Zk=" + "rev": "fb9a41fe9bc230a07c4506cad3cbf21d3fa635b4", + "sha256": "gBOxKSv3j229IVdtffqFV/zSSacEs8UsBERnQgdFw4Y=" }, "citra": { "owner": "libretro", "repo": "citra", - "rev": "44e01f99016008eff18bc7a28234d1098382358d", - "sha256": "vIrUStv+VM8pYeznnWSVBRfSA71/B7VIY7B/syymGzE=", + "rev": "70bf7d8a63b0b501e8f5cff89a86a3e2d4083aa0", + "sha256": "uHWROH6/ZAZygkhEQGNyllncCp2XDCdYwy/CKgGKAcM=", "fetchSubmodules": true }, "desmume": { "owner": "libretro", "repo": "desmume", - "rev": "5d0ae2be2c9fb6362af528b3722e81323318eb9f", - "sha256": "4bJ6fLZ+fV7SnZ71YT3JFcXFOgmskNUCmCHwc2QNl0A=" + "rev": "fbd368c8109f95650e1f81bca1facd6d4d8687d7", + "sha256": "7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ=" }, "desmume2015": { "owner": "libretro", @@ -123,20 +123,20 @@ "dolphin": { "owner": "libretro", "repo": "dolphin", - "rev": "6a0b6ee8a4d5363e669f5faf43abc8f17e4278a8", - "sha256": "TeeHnttGmCeOTDTK/gJM+RpusjDDndapZAa3T+oLiq0=" + "rev": "9810e29a1f3633d32b6643b97a1147d83311d73a", + "sha256": "iIaVSJSC3mD1k751vQvWI6x0C/HhfjEaMwfX53FpZv4=" }, "dosbox": { "owner": "libretro", "repo": "dosbox-libretro", - "rev": "74cd17ed0ff810ff78cb8c1f1e45513bfe8a0f32", - "sha256": "0PIloW7j/87asDJ8IDw4r3r4muxNF+RbvkIRPLZQvRc=" + "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", + "sha256": "PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" }, "eightyone": { "owner": "libretro", "repo": "81-libretro", - "rev": "2e34567a320cba27b9162b1776db4de3cdb7cf03", - "sha256": "vjrHRLzc9Fy0MwV9d+LlcJTGJfVsRauEig8R+erBtfw=" + "rev": "73f6cca62dabc84df946aea71cf457ce5ae5ea9d", + "sha256": "oovIKMZXxtLc+zmbguagTVoMPngokdN3xTBnb/+KUjY=" }, "fbalpha2012": { "owner": "libretro", @@ -147,14 +147,14 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "e4625a196b9232ba93a156e3a5164aa11193f20a", - "sha256": "/5JmwuLWWBQWXnqCMjKzOC2XG6wo5a6xgQOYX1P1zcw=" + "rev": "8678b0fcd02c4049c0cfa40a0ab87fded1bbedd8", + "sha256": "MiLYaURj17Sq8V31SDFQ93XH4DAYMQQelVq+4EBmtro=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "b3c35b6515b2b6a789c589f976a4a323ebebe3eb", - "sha256": "zwFQGQyO0Vj/IBM1k8JB3D/jB3OwDuGdSHLavr8Fxgw=" + "rev": "3d3cc53c0177e296af2427c29bbb31902b26f3b8", + "sha256": "Z5LqP6IBq0H6uM0027PSkW6JLvVDA/4CrO6bI478Z1o=" }, "flycast": { "owner": "libretro", @@ -165,38 +165,38 @@ "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "11fa9f3c08cde567394c41320ca76798c2c64670", - "sha256": "1u5c5oDIjjXEquh6UBv2H1F/Ln7h44DTF1ohDG0Qnww=" + "rev": "1360c9ff32b390383567774d01fbe5d6dfcadaa3", + "sha256": "LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg=" }, "freeintv": { "owner": "libretro", "repo": "freeintv", - "rev": "295dd3c9e4b2d4f652f6a6a904afbe90a8187068", - "sha256": "tz0X6AfD7IL3Y50vjgSO5r6sDhu++6Gj8Rp7de5OqMk=" + "rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb", + "sha256": "ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" }, "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "15536214cdce31894d374b2ffa2494543057082b", - "sha256": "cTSoK6rezRajnuWPt7WkYn3SWL0sTu7h5X3Ig1KukDA=" + "rev": "7e02df60048db0898131ea365f387a026e4e648d", + "sha256": "RnFuD8PL+/uPhWe+sSXMPm5+XH8FzCwY+MSquR/AB+o=" }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "7520ac8aae7b08262c0472e724e6ef0bfe41d285", - "sha256": "wKcO/dulgZKgXTuHdcQvfSrfxSI5UA0az6qMLtP4K6g=" + "rev": "5cdb31854074de1662266a0a675866ea7b787b42", + "sha256": "vMswSKM5aYlPZu5y4Z1L/+eaPBdQaLPPMKoC7B/xzqc=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "f0f0b31f9ab95946965b75fed8d31e19290f3d43", - "sha256": "aiegBSpQDyXzVkyWuUpI66QvA1tqS8PQ8+75U89K10A=" + "rev": "81649a2c8075201bb823cce8fdf16a31c92a3b6c", + "sha256": "De9Tke+fp6CtXzm0w6Qzts3jj1j/1uB0kYZfaWyNqA0=" }, "gw": { "owner": "libretro", "repo": "gw-libretro", - "rev": "d08a08154ce8ed8e9de80582c108f157e4c6b226", - "sha256": "PWd/r4BBmhiNqJdV6OaXHr4XCdR1GyVipq3zvyBcqEs=" + "rev": "19a1cb3105ca4a82139fb4994e7995fd956f6f8d", + "sha256": "luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0=" }, "handy": { "owner": "libretro", @@ -207,44 +207,44 @@ "hatari": { "owner": "libretro", "repo": "hatari", - "rev": "e5e36a5262cfeadc3d1c7b411b7a70719c4f293c", - "sha256": "T4I3NVEMBKr5HLs60x48VNRl2TMnhqvaF+LTtYQ7qdU=" + "rev": "1ebf0a0488580ef95c0b28f02223b31813c867c5", + "sha256": "i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao=" }, "mame": { "owner": "libretro", "repo": "mame", - "rev": "b7dd999590717638ceade2e24d16d63147aa12ad", - "sha256": "QgENNjykhO+WSxAb//J+R7QP3/rZnxqv7sarO4eBYuc=" + "rev": "fcacbc7811a9b69874fd09b91e7217e44c6a0980", + "sha256": "WiBmqBcqxXmeQOmTN4FDDUv680uqAkpYUOnvJ7FXn4k=" }, "mame2000": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "dd9d6612c29bf5b29bc2f94cab2d43fe3dcd69ee", - "sha256": "X0fP0bNBk2hqXVdRspylLIjZO563aMXkyX4qgx/3Vr8=" + "rev": "0208517404e841fce0c094f1a2776a0e1c6c101d", + "sha256": "WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ=" }, "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "3eb27d5f161522cf873c0642f14b8e2267b3820f", - "sha256": "TQ4FwboKeEP58hOL2hYs4OYes2o0wSKFSp4CqZV5r6I=" + "rev": "cb0c89304b2cd584cda7105c6be4e69fa304f0e0", + "sha256": "ob/aUh5NZCfQvpA+nEs2QhVXeNBBVZesX/xQfatY9wU=" }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "e5ee29ecb8182952f861f22516e5791625fe2671", - "sha256": "YunfAITR/Etm8lvEab/HigZoBz+ayJQ7ezjItWI/HvE=" + "rev": "982db57b325b54aa90a60bd2e512b624d3b6642c", + "sha256": "uyysUD/PULHyaOw42GJoBsT9fYdYuAl4eLCVNRU8/Sw=" }, "mame2010": { "owner": "libretro", "repo": "mame2010-libretro", - "rev": "932e6f2c4f13b67b29ab33428a4037dee9a236a8", - "sha256": "HSZRSnc+0300UE9fPcUOMrXABlxHhTewkFPTqQ4Srxs=" + "rev": "5f524dd5fca63ec1dcf5cca63885286109937587", + "sha256": "OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M=" }, "mame2015": { "owner": "libretro", "repo": "mame2015-libretro", - "rev": "e6a7aa4d53726e61498f68d6b8e2c092a2169fa2", - "sha256": "IgiLxYYuUIn3YE+kQCXzgshES2VNpUHn0Qjsorw0w/s=" + "rev": "2599c8aeaf84f62fe16ea00daa460a19298c121c", + "sha256": "TURTX0XrvqwqKG3O3aCttDAdicBdge5F1thVvYgEHaw=" }, "mame2016": { "owner": "libretro", @@ -255,20 +255,20 @@ "melonds": { "owner": "libretro", "repo": "melonds", - "rev": "e93ec3e462d3dfc1556781510a3cee113f02abb2", - "sha256": "NDrsqX17OKw1/PIZSrWAxhVl+Qk/xG7lCnr6Ts+7YJ4=" + "rev": "6a03f3f11a729dbf698ec53954c735a0680aca01", + "sha256": "GH/G/UzwjNqHwtIwx6VohP4XsJKe+EFU2n+GX43IByM=" }, "mesen": { "owner": "libretro", "repo": "mesen", - "rev": "bb9ea02eba28682986044a6f49329ec533aa26ba", - "sha256": "G2NQDpByvI9RFEwrRiKXcMnPtVtqpvEoZgk7/fk5qCU=" + "rev": "9b412c1533a6d7eec7b2904775cbd26c21f02119", + "sha256": "Tf+lWfSU7AuW6Um5TXkWNAeg35W08YkYQwW0Yx3iNTM=" }, "mesen-s": { "owner": "libretro", "repo": "mesen-s", - "rev": "b0b53409eecb696fb13f411ffde72e8f576feb09", - "sha256": "lDHyeIsVsI5+ZK8EJI50alrFuu0uJmxscda5bR1UmQQ=" + "rev": "32a7adfb4edb029324253cb3632dfc6599ad1aa8", + "sha256": "/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo=" }, "meteor": { "owner": "libretro", @@ -279,114 +279,120 @@ "mgba": { "owner": "libretro", "repo": "mgba", - "rev": "5d48e0744059ebf38a4e937b256ffd5df4e0d103", - "sha256": "OYw2nlldFx5B7WX0E8Gbgfp1j4h65ZxyKDS9tneHXQg=" + "rev": "db7ace387cdc87d9f2bd4f9f5211c26ce0b07867", + "sha256": "i/U5yrnGQBRHqBu8c/mQ7Eov43+6IOOs+H8pSKXNM1E=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "6e9dcd2cd9d23d3e79eaf2349bf7e9f25ad45bf1", - "sha256": "rs/VL2K6aS8Rl01IyxUiWipzLEzg+7+fbXxI0qN5X/I=" + "rev": "c10546e333d57eb2e5a6ccef1e84cb6f9274c526", + "sha256": "dbS32slJBfz8DHeIQy20lAYw0+ig0LRgIaGfqW082xs=" }, "neocd": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "327aeceecdf71c8a0c0af3d6dc53686c94fe44ad", - "sha256": "cY0P+0EQ0b9df+YT2EMvrxjp5L+DwIg31rEJqchU+hc=" + "rev": "b7d96e794f2dfa500cba46c78cbc3c28349cfd05", + "sha256": "TG5xIqIM0MlHDNtPhyISqo/ctTqemKROwXgoqUsCQ0E=" }, "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "a9e197f2583ef4f36e9e77d930a677e63a2c2f62", - "sha256": "QqmWSk8Ejf7QMJk0cVBgpnyqcK6oLjCnnXMXInuWfYc=" + "rev": "a9ee6ca84f04990e209880fe47144e62b14253db", + "sha256": "q3pD2Cm/a62x3xW8JymU9w82zHlT0BoPlaSfzjZzh/c=" }, "np2kai": { "owner": "AZO234", "repo": "NP2kai", - "rev": "2b09ea6a589cdcae27bca27160b3f82638fbb45d", - "sha256": "M3kGA1TU3xui6of9XgUspI+Zf+hjYP1d2mgKwxsy3IQ=", + "rev": "606fafa7081b62df5f4727c34560da23927c21cd", + "sha256": "qS7OrY8bFkAmRgbzLCw9PqgxtKuVNKI+tsDVU7PqWIw=", "fetchSubmodules": true }, "nxengine": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "bc692a392473a45f63cdccbb353c3445b530d671", - "sha256": "tAZkYHRKL+mI6f7YCnaU0qTSOZGW2o20p6wovMK1n2k=" + "rev": "aa32afb8df8461920037bdbbddbff00bf465c6de", + "sha256": "Ic5YsNLoEZJ/vkjthwypwLN3ntB/5EX8bU92V80S7R4=" }, "o2em": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "641f06d67d192a0677ec861fcb731d3ce8da0f87", - "sha256": "s3FreOziXeGhUyQdSoOywZldD21m3+OXK0EJ2Z8rXiY=" + "rev": "3303cc15e4323280084471f694f6d34c78199725", + "sha256": "xH8Dlsg84q8awxjObMPXKZcJSwmix1YdRXIpee7rw6o=" }, "opera": { "owner": "libretro", "repo": "opera-libretro", - "rev": "3849c969c64b82e622a7655b327fa94bc5a4c7cc", - "sha256": "McSrvjrYTemqAAnfHELf9qXC6n6Dg4kNsUDA7e2DvkE=" + "rev": "8a49bb8877611037438aeb857cb182f41ee0e3a1", + "sha256": "oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM=" }, "parallel-n64": { "owner": "libretro", "repo": "parallel-n64", - "rev": "b804ab1a199d6ff1f8fef4aa7dfcf663990e430b", - "sha256": "zAet6hYa/79CBbvwZNTNs/ayWuHHlwg+0Y4BAUFddBc=" + "rev": "a03fdcba6b2e9993f050b50112f597ce2f44fa2c", + "sha256": "aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA=" }, "pcsx2": { "owner": "libretro", "repo": "pcsx2", - "rev": "0251730a21d7238856d79aa25e2942b48edb38f6", - "sha256": "a/lWLBCww4QwxdO7Sbvmfq0XF9FnP4xzF51ljsWk46I=" + "rev": "ad7650949e6c8c87cd2c5e278af88e3722a321bc", + "sha256": "iqXCW28werxbZNo1hlDLiD3ywSZ9hvWmxwGPJ5bRZ+w=" }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "e24732050e902bd5402b2b7da7c391d2ca8fa799", - "sha256": "tPz5E3QO6FucjYOzdjbY2FHLPz1Fmms10tdt7rZIW8U=" + "rev": "5b406fd9567c0829171af44b3325dae6dd155732", + "sha256": "V+z58fRSaLurDiu4Y/xQjndkMKPSmEGjay3foDkppM0=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "7ff457f2f833570013f2a7e2608ac40632e0735d", - "sha256": "xEG5swvvWFhvosC1XpFaZphESNaf4AtX+6UE02B57j8=", + "rev": "26719f348eb579a8372e2c58ef0132d95d9dc817", + "sha256": "xD8RxFHeKOltIc35Zudj29x+vkq2AXfSKu0/ZzQQHi4=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "39eb5c2eb6da65dc76b1c4d1319175a68120a77a", - "sha256": "EF3p0lvHjKGt4pxtTAkDM+uHsnW72lN+Ki8BaZIk/BQ=", + "rev": "1129440ab6ede8263275dc3a5eec1624d20442fb", + "sha256": "nTJjxVPGOofnIZbjGe3GZDIj4YnC73IbSdGsSuVIjEA=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "83b8211abf7fb705835eb1ccf8feae04816ae96c", - "sha256": "8K4bz/GUnE8GrlAVFULMXLC+i3ZYvR28EpehEg6up4s=", + "rev": "16f93a26844b26e11cf9becfd275c4a637bfd1ab", + "sha256": "k1URDPE4kRMY1LUeR2zcLJFGt0Gnt5N8gTQHpIxDdRw=", "fetchSubmodules": true }, "prboom": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "b22a6b19fd976a14374db9083baea9c91b079106", - "sha256": "NmEWRTHaZjV2Y6Wrc3WOamXCnOawKc2ja1KBDxokRiY=" + "rev": "4e671fa0a4b7b892e17ac4e1803c9d627653a4c1", + "sha256": "d2/cpfhNczZkHzMGQIxO9jw65AMs9Jmh4ItiLLdDYsk=" }, "prosystem": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "fbf62c3dacaac694f7ec26cf9be10a51b27271e7", - "sha256": "Opb6CUeT/bnaTg4MJo7DNsVyaPa73PLbIor25HHWzZ0=" + "rev": "cf544d3c8e40ff197ea5bb177a1269db31077803", + "sha256": "A7yQwzM8ewI+UCPQVyO7DNyiQCTw2yG1soi6l7T3pDE=" + }, + "puae": { + "owner": "libretro", + "repo": "libretro-uae", + "rev": "1b7dd443ff89d667d99f8c44454a91ed59bcabd9", + "sha256": "YJiZEtB0rBFffEZj/hB7zEFBUp02kCzblq4CtCmygKo=" }, "quicknes": { "owner": "libretro", "repo": "QuickNES_Core", - "rev": "e6f08c165af45fc2d2f26c80ba0cfc33e26f9cfe", - "sha256": "JQtlqN3mvIwKy6iN9opHPHnh0E7AIn9JVitIfXklI/I=" + "rev": "1b88a09f1c386ff9ee46bb371583ae04c5cb5dd0", + "sha256": "Q7DDufGTdP+R05ND56PxMNR96ZacJFxPi0ETieV2B58=" }, "sameboy": { "owner": "libretro", "repo": "sameboy", - "rev": "b154b7d3d885a3cf31203f0b8f50d3b37c8b742b", - "sha256": "tavGHiNpRiPkibi66orMf93cnCqQCD8XhSl/36nl/9M=" + "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", + "sha256": "hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" }, "scummvm": { "owner": "libretro", @@ -397,38 +403,38 @@ "smsplus-gx": { "owner": "libretro", "repo": "smsplus-gx", - "rev": "9de9847dc8ba458e9522d5ae8b87bf71ad437257", - "sha256": "XzqQ/3XH5L79UQep+DZ+mDHnUJKZQXzjNCZNZw2mGvY=" + "rev": "60af17ddb2231ba98f4ed1203e2a2f58d08ea088", + "sha256": "2SZR9BOTYLmtjEF4Bdl49H2pFNEIaU68VqlA7ll5TqU=" }, "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "3c729a9763263bc3a69f48370e43ae05e672970a", - "sha256": "01M6Wvbu1omMwh3Xg4RGh028jirGs7mLpxwKJgMRQxA=" + "rev": "28be1a196d2c59ed4b6489d487187569a7370aff", + "sha256": "FW4ynSS+R1ygQaCS0UrWGktfHGtcy0P/Mp/BXKfmII0=" }, "snes9x2002": { "owner": "libretro", "repo": "snes9x2002", - "rev": "c4397de75a5f11403d154abd935e39fe969bca94", - "sha256": "yL4SIRR1Er+7Iq3YPfoe5ES47nvyA3UmGK+upLzKiFA=" + "rev": "540baad622d9833bba7e0696193cb06f5f02f564", + "sha256": "WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=" }, "snes9x2005": { "owner": "libretro", "repo": "snes9x2005", - "rev": "23f759bc4bf2e39733296f7749e446418e3cd0f3", - "sha256": "/bZrMp7NHgdYvA3Tw1ZoWXRg7VxmatRUX5cCJsU3NCY=" + "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", + "sha256": "zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" }, "snes9x2010": { "owner": "libretro", "repo": "snes9x2010", - "rev": "c98224bc74aa0bbf355d128b22e4a2a4e94215b0", - "sha256": "mf5msdwdcRRfFWHwmWLS/qKd7gNlLwexGEB6wB6TfhE=" + "rev": "e86e54624a7910a64a9a744e3734d4067c48d240", + "sha256": "U1eeXuhYssAOgiNOZ7fr/8rkPScts3GmWgK6ki39PVA=" }, "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "efb2a9f299cad241e12d811580f28d75b6c3438d", - "sha256": "QYwDTd8EZUMXJiuSJtoW8XQXgl+Wx0lPkNLOwzM5bzA=" + "rev": "65115cc3a133d68979f3096bdecb067bcaedb493", + "sha256": "letOnjaIGIjC9xwj5C156VkBhMPFtVq12FG7SuC5+OY=" }, "stella2014": { "owner": "libretro", @@ -439,14 +445,14 @@ "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "0e53a5ac09a30d73d78b628f7e4954ebe5615801", - "sha256": "vOu99fsm2oeSi96tWR+vV5suZSYCyXJVgOdvjnKbNhg=" + "rev": "b6a18318bd7bf0d3b28b50d2b554810ea11b30cb", + "sha256": "jZ6SfiHFJyaTFvINrEe61yhUtWYoqRzaAi0vLuDnMuo=" }, "tgbdual": { "owner": "libretro", "repo": "tgbdual-libretro", - "rev": "1e0c4f931d8c5e859e6d3255d67247d7a2987434", - "sha256": "0wHv9DpKuzJ/q5vERqCo4GBLre2ggClBIWSjGnMLQq8=" + "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", + "sha256": "MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=" }, "thepowdertoy": { "owner": "libretro", @@ -457,15 +463,15 @@ "tic80": { "owner": "libretro", "repo": "tic-80", - "rev": "e9f62f85a154796c6baaee8a9f6fd0cfdd447019", - "sha256": "JTAoIqxqpaLjsQiIpJ4wQsREI5/rTxVxDywoL3oLI4Q=", + "rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11", + "sha256": "RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", "fetchSubmodules": true }, "vba-m": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "254f6effebe882b7d3d29d9e417c6aeeabc08026", - "sha256": "vJWjdqJ913NLGL4G15sRPqO/wp9xPsuhUMLUuAbDRKk=" + "rev": "7c25d64d6903c6d859cce781c52da0671c4f7d3e", + "sha256": "U+jBM34sZxny9lpuegQ8YDKBwYrWOAyLBMKumoQCok4=" }, "vba-next": { "owner": "libretro", @@ -476,8 +482,8 @@ "vecx": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "141af284202c86ed0d4ce9030c76954a144287cf", - "sha256": "p5vMuG2vr3BTJOQWNcTPb89MlkVrRvJNTIJSU8r9zfU=" + "rev": "b5c17bb7fd4a704f58160bc699322a16d0643396", + "sha256": "nICXrVyoMWs2yDcewHd7z6rBt+haY/Dqf5lvF6RLnyg=" }, "virtualjaguar": { "owner": "libretro", @@ -488,7 +494,7 @@ "yabause": { "owner": "libretro", "repo": "yabause", - "rev": "17dfcd8de4700341d972993501d3a043925675ce", - "sha256": "xwW7Oe3Cy3yC0xC5acLW6OGUIG+dKd1mwiXK5ZAumdo=" + "rev": "c7e02721eddb3de0ec7ae0d61e9e3afa5f586a62", + "sha256": "Y2YsPpgBA021pRDOFqH29zsRSbFIpRo5fq+tkknJbSA=" } } diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index bb6fd2884a50..eb8ae705af73 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -71,6 +71,7 @@ CORES = { "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"}, "scummvm": {"repo": "scummvm"}, diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index f383e3c85aeb..177e185d8273 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , meson, ninja, pkg-config, python3, wayland-scanner , cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput -, libjpeg, libseat, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland +, libjpeg, seatd, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland , wayland-protocols, xlibsWrapper , pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null , libva ? null, libwebp ? null, xwayland ? null @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput - libjpeg libseat libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam + libjpeg seatd libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam pango pipewire udev vaapi wayland wayland-protocols xlibsWrapper ]; diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 34d4c0d9d2c2..0017bd8c482c 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-J4cbqkkPNAFBSteT+6SQhvbIVbHFhDhe13ceEgTH4Xk="; + sha256 = "sha256-LOkw1wqTHeZg/a8nHXAZJ5OxskAnJkW/AnV3n2cE32s="; }; strictDeps = true; diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 69735c801edd..5f34434b50f9 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -10,12 +10,13 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."2.0".sha256 = "sha256-x9AEFadlYiIIOxAhjv4Vc/dxdRZC7AdWQ6AByvLOFDk="; release."1.1".sha256 = "sha256:0jb28vgkr4xpg9d6k85rq7abpx5ch612iw9ps5w8q80q1jpjlc4z"; release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "1.1"; } + { cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "2.0"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index e1472b594a40..c10b5a705425 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -2,22 +2,19 @@ stdenv.mkDerivation rec { pname = "spglib"; - version = "1.16.5"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.0.1"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - sha256 = "sha256-BbqyL7WJ/jpOls1MmY7VNCN+OlF6u4uz/pZjMAqk87w="; + sha256 = "sha256-0M3GSnNvBNmE4ShW8NNkVrOBGEF9A0C5wd++xnyrcdI="; }; nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; - checkTarget = "check"; - doCheck = true; - meta = with lib; { description = "C library for finding and handling crystal symmetries"; homepage = "https://spglib.github.io/spglib/"; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index c90e2b74cb29..2ae3ef374eb5 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "36"; + version = "37"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ko3lfFitY6fFomh4dLSHdY6moeG2k11fmdcViT3IKGU="; + hash = "sha256-VKR01lbXznkO/OQvvxvMJOjPIPSynLWT6G/YV4Essy0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 7390d861dd3e..fe99e9711818 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.14.6"; + version = "0.14.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sLh9kM4HcsLrvljvdyLBa0FkkJyTT9zbwumKGTHN1UE="; + hash = "sha256-59bwgjT3zFYx4q8G5Bi5RMUSQCVIlupu7rtycgXNXtg="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index cfb9364c30d8..b072c5576d1f 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.16.1"; + version = "0.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Gamys354RIvUQOelN8YDY6GfpJanC7CjWXC1plmh/jU="; + hash = "sha256-IB0Ms+mCHh7lfG3XYfvE2h/2lec5Tq9AAjqANz7x0hE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index ac57a730af88..f6699f24258e 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.18.4"; + version = "3.18.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-iQxtIpswXQWlknUoq9a7nsTCnVDP2aNUEuWco5xKnVc="; + sha256 = "sha256-b778qmf0LkSAo8/eho1zoC0kc4byexqCG3R/fRBlr6M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 9fcfafd99e0a..cf5e8bf8302a 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.4.0"; + version = "7.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JTNa/+4jQtR+NcJd9ed4XSKlM1hP4b4JQ8y6Rdwa5Yk="; + hash = "sha256-TFs9Oq6qvR7IGgqMQPnM0o+oy51k7RORfJkNF0ZU+h0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index f25ab691965d..5bd24653f30d 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.15.2"; + version = "3.15.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RnqHmqF29r1VU8s920mxQE80f2kJKHJtMmRi1R2caAM="; + sha256 = "sha256-wvoxZXSlPWEifwP4Gdgg4wsVjDGm5NzhaZjAUZ886ZI="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 789cf6b87949..b0cd9fdd1991 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.21"; + version = "4.3.21.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/QF6ZzOvGT0U8bsptP95wKvJBuhlQVjRerpFemOBr+I="; + sha256 = "sha256-STgUgpZD/AShRZXtpszWm9wGBkd1QczaVCOM4/YLyZM="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 51210e5abb2e..76923f829a3f 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.11"; + version = "2.28.11.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fugn64zmEbArURfP7F2mRVNltqV19eP/GfZVumA+a04="; + sha256 = "sha256-ArGAbFuZBO3Nh/opI2FkrqDmzcTZPqAgzWFe9ly0PWU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index c9a2f87f91a7..3508b26a9525 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.48.1"; + version = "0.48.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-SLVOvGGhyn/kMYgZUmcy5cw7tDHS7wIcVdP5ZnRgmVc="; + hash = "sha256-4QltLEapYOzCwejeBWAhTdI8UVdlSAqcqFanvsTKBLw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix new file mode 100644 index 000000000000..c14cabbfa32b --- /dev/null +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "opcr-policy"; + version = "0.1.42"; + + src = fetchFromGitHub { + owner = "opcr-io"; + repo = "policy"; + rev = "v${version}"; + sha256 = "sha256-taC/VZBalJMFi8kVw7R03ibmHTwbKTxj3mcYbXms26M="; + }; + vendorSha256 = "sha256-r2eKRJC8/fDY38u924ViLCf7kT54Tc+zIBD2YV9Qn6c="; + + ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; + + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/policy --help + $out/bin/policy version | grep "version: ${version}" + + runHook postInstallCheck + ''; + + meta = with lib; { + mainProgram = "policy"; + homepage = "https://www.openpolicyregistry.io/"; + changelog = "https://github.com/opcr-io/policy/releases/tag/v${version}"; + description = "CLI for managing authorization policies"; + longDescription = '' + The policy CLI is a tool for building, versioning and publishing your authorization policies. + It uses OCI standards to manage artifacts, and the Open Policy Agent (OPA) to compile and run. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ naphta jk ]; + }; +} diff --git a/pkgs/os-specific/linux/libbpf/0.x.nix b/pkgs/os-specific/linux/libbpf/0.x.nix new file mode 100644 index 000000000000..2c15e3d49ee1 --- /dev/null +++ b/pkgs/os-specific/linux/libbpf/0.x.nix @@ -0,0 +1,49 @@ +{ fetchFromGitHub +, elfutils +, pkg-config +, stdenv +, zlib +, lib +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "libbpf"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "libbpf"; + repo = "libbpf"; + rev = "v${version}"; + sha256 = "sha256-daVS+TErmDU8ksThOvcepg1A61iD8N8GIkC40cmc9/8="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ elfutils zlib ]; + + enableParallelBuilding = true; + makeFlags = [ "PREFIX=$(out)" "-C src" ]; + + passthru.tests = { + bpf = nixosTests.bpf; + }; + + postInstall = '' + # install linux's libbpf-compatible linux/btf.h + install -Dm444 include/uapi/linux/*.h -t $out/include/linux + ''; + + # FIXME: Multi-output requires some fixes to the way the pkg-config file is + # constructed (it gets put in $out instead of $dev for some reason, with + # improper paths embedded). Don't enable it for now. + + # outputs = [ "out" "dev" ]; + + meta = with lib; { + description = "Upstream mirror of libbpf"; + homepage = "https://github.com/libbpf/libbpf"; + license = with licenses; [ lgpl21 /* or */ bsd2 ]; + maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert martinetd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 2c15e3d49ee1..04322a35b4fe 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.8.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-daVS+TErmDU8ksThOvcepg1A61iD8N8GIkC40cmc9/8="; + sha256 = "sha256-2rzVah+CxCztKnlEWMIQrUS2JJTLiWscfIA1aOBtIzs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index d803f68ee3a1..5450853c8e8f 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.23.3"; + version = "1.24.2"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-RkyHEcz5T8BZoIeLK5OjrJVBNQg5rfFDcHpE52sNM6U="; + sha256 = "sha256-2DUP3g7k0DLXlmhCZH0IUgWpYbdUnRjtsc7uEioYzrE="; }; - vendorSha256 = "sha256-JvDX55JY5B7f+6GK7x6D1iSyM/h2l5MuAkH2YXodYdM="; + vendorSha256 = "sha256-RsNsjDUAqNtNDqCC+UjKTw4ue4Yd0A7k8tU+wYiQIbc="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 1f118d33699a..8df0dc1e4b11 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -2,11 +2,11 @@ , dataPath ? "/var/lib/snappymail" }: stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.18.3"; + version = "2.18.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-QAdR7fhF05taVtoUqqbw6EELnSDwRtX2O43VN8p6L7Q="; + sha256 = "sha256-DROYIX6EngVjcS5WWf/svFE9AQ2kOruwGpM0qF8wQf8="; }; sourceRoot = "snappymail"; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 297f98ee3db3..ee290402962c 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -14,17 +14,18 @@ , libosmium , protozero , rapidjson +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "openstreetmap"; - repo = pname; - rev = version; - hash = "sha256-MWJzCZdqvy/nH1Doj0fmGuzTubaHDnPOED7qgzvJ3ZU="; + repo = "osm2pgsql"; + rev = finalAttrs.version; + hash = "sha256-+//cAoN8m66SboEYP5Dhtm0q0+oyvEr5o584e4JQ9xM="; }; postPatch = '' @@ -45,6 +46,10 @@ stdenv.mkDerivation rec { "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://osm2pgsql.org"; @@ -52,4 +57,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ jglukasik das-g ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b6222fa81de..9a9b20cea20e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16172,7 +16172,10 @@ with pkgs; bump = callPackage ../development/tools/github/bump { }; - libbpf = callPackage ../os-specific/linux/libbpf { }; + libbpf_1 = callPackage ../os-specific/linux/libbpf { }; + libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { }; + # until more issues are fixed default to libbpf 0.x + libbpf = libbpf_0; bpftools = callPackage ../os-specific/linux/bpftools { }; @@ -30155,6 +30158,8 @@ with pkgs; onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; + opcr-policy = callPackage ../development/tools/opcr-policy { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; openshift = callPackage ../applications/networking/cluster/openshift { };