Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

8 files changed, 55 insertions, 58 deletions

diff --git a/nixpkgs/pkgs/desktops/arcan/arcan/003-freetype.patch b/nixpkgs/pkgs/desktops/arcan/arcan/003-freetype.patch
deleted file mode 100644
index e38d329b0260..000000000000
--- a/nixpkgs/pkgs/desktops/arcan/arcan/003-freetype.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
---- source-old/src/CMakeLists.txt	1969-12-31 21:00:01.000000000 -0300
-+++ source-new/src/CMakeLists.txt	2021-10-29 12:03:06.461399341 -0300
-@@ -317,9 +317,7 @@
- 		find_package(BZip2 REQUIRED QUIET)
- 		pkg_check_modules(HARFBUZZ REQUIRED QUIET harfbuzz)
- 		ExternalProject_Add(Freetype
--			SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/freetype"
--			UPDATE_COMMAND ""
--			GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/freetype"
-+			SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/freetype"
- 			${EXTERNAL_DEFS}
- 			${CMAKE_EXTERNAL_DEFS}
- 			-DWITH_ZLIB=OFF
diff --git a/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix b/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix
index c7c6bebb704a..bd39c0843a86 100644
--- a/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix
+++ b/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix
@@ -3,23 +3,23 @@
   letoram-openal-src = fetchFromGitHub {
     owner = "letoram";
     repo = "openal";
-    rev = "1c7302c580964fee9ee9e1d89ff56d24f934bdef";
-    hash = "sha256-InqU59J0zvwJ20a7KU54xTM7d76VoOlFbtj7KbFlnTU=";
+    rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a";
+    sha256 = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420=";
   };
   freetype-src = fetchgit {
     url = "git://git.sv.nongnu.org/freetype/freetype2.git";
-    rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57";
-    sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg=";
+    rev = "275b116b40c9d183d42242099ea9ff276985855b";
+    sha256 = "sha256-YVyJttaXt19MSuD0pmazwxNKz65jcqqWvIgmDj4d3MA=";
   };
   libuvc-src = fetchFromGitHub {
     owner = "libuvc";
     repo = "libuvc";
-    rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837";
-    sha256 = "sha256-2zCTjyodRARkHM/Q0r4bdEH9LO1Z9xPCnY2xE4KZddA=";
+    rev = "a4de53e7e265f8c6a64df7ccd289f318104e1916";
+    hash = "sha256-a+Q0PTV4ujGnX55u49VJfMgQljZunZYRvkR0tIkGnHI=";
   };
   luajit-src = fetchgit {
     url = "https://luajit.org/git/luajit-2.0.git";
-    rev = "d3294fa63b344173db68dd612c6d3801631e28d4";
-    sha256 = "sha256-1iHBXcbYhWN4M8g5oH09S1j1WrjYzI6qcRbHsdfpRkk=";
+    rev = "899093a9e0fa5b16f27016381ef4b15529dadff2";
+    sha256 = "sha256-bCi1ms78HCOOgStIY2tSGM9LUEX3qnwadLLeYWWu1KI=";
   };
 }
diff --git a/nixpkgs/pkgs/desktops/arcan/arcan/default.nix b/nixpkgs/pkgs/desktops/arcan/arcan/default.nix
index f3f4be2fcc4a..0cd7e4e0db64 100644
--- a/nixpkgs/pkgs/desktops/arcan/arcan/default.nix
+++ b/nixpkgs/pkgs/desktops/arcan/arcan/default.nix
@@ -8,7 +8,10 @@
 , ffmpeg
 , file
 , freetype
+, glib
+, gumbo
 , harfbuzz
+, jbig2dec
 , leptonica
 , libGL
 , libX11
@@ -24,11 +27,14 @@
 , libvncserver
 , libxcb
 , libxkbcommon
-, lua
+, lua5_1
 , luajit
 , makeWrapper
 , mesa
+, mupdf
 , openal
+, openjpeg
+, pcre
 , pkg-config
 , sqlite
 , tesseract
@@ -46,15 +52,15 @@
 , useStaticSqlite ? false
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "letoram";
     repo = "arcan";
-    rev = version;
-    hash = "sha256-2do4+6KB0AAcJk22mN0IA/e/bPaeGipLjI4RSTPqLBg=";
+    rev = finalAttrs.version;
+    hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0=";
   };
 
   nativeBuildInputs = [
@@ -71,7 +77,10 @@ stdenv.mkDerivation rec {
     ffmpeg
     file
     freetype
+    glib
+    gumbo
     harfbuzz
+    jbig2dec
     leptonica
     libGL
     libX11
@@ -87,10 +96,13 @@ stdenv.mkDerivation rec {
     libvncserver
     libxcb
     libxkbcommon
-    lua
+    lua5_1
     luajit
     mesa
+    mupdf.dev
     openal
+    openjpeg.dev
+    pcre
     sqlite
     tesseract
     valgrind
@@ -106,7 +118,6 @@ stdenv.mkDerivation rec {
     ./000-openal.patch
     ./001-luajit.patch
     ./002-libuvc.patch
-    ./003-freetype.patch
   ];
 
   # Emulate external/git/clone.sh
@@ -145,8 +156,8 @@ stdenv.mkDerivation rec {
     substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID"
   '';
 
-  # INFO: According to the source code, the manpages need to be generated before
-  # the configure phase
+  # INFO: Arcan build scripts require the manpages to be generated
+  # before the configure phase
   preConfigure = lib.optionalString buildManPages ''
     pushd doc
     ruby docgen.rb mangen
@@ -157,7 +168,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_PRESET=everything"
     # The upstream project recommends tagging the distribution
     "-DDISTR_TAG=Nixpkgs"
-    "-DENGINE_BUILDTAG=${version}"
+    "-DENGINE_BUILDTAG=${finalAttrs.version}"
     "-DHYBRID_SDL=on"
     "-DBUILTIN_LUA=${if useBuiltinLua then "on" else "off"}"
     "-DDISABLE_JIT=${if useBuiltinLua then "on" else "off"}"
@@ -185,4 +196,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.unix;
   };
-}
+})
diff --git a/nixpkgs/pkgs/desktops/arcan/default.nix b/nixpkgs/pkgs/desktops/arcan/default.nix
index 9d9f28a79538..3db4d4eb819c 100644
--- a/nixpkgs/pkgs/desktops/arcan/default.nix
+++ b/nixpkgs/pkgs/desktops/arcan/default.nix
@@ -1,6 +1,6 @@
-{ callPackage, lib, pkgs }:
+{ config, lib, pkgs }:
 
-rec {
+lib.makeScope pkgs.newScope (self: with self; {
   # Dependencies
 
   espeak = pkgs.espeak-ng;
@@ -40,4 +40,4 @@ rec {
     name = "all-wrapped";
     appls = [ durden pipeworld ];
   };
-}
+})
diff --git a/nixpkgs/pkgs/desktops/arcan/durden/default.nix b/nixpkgs/pkgs/desktops/arcan/durden/default.nix
index 46012d69d2dd..d5e9d0693c84 100644
--- a/nixpkgs/pkgs/desktops/arcan/durden/default.nix
+++ b/nixpkgs/pkgs/desktops/arcan/durden/default.nix
@@ -3,15 +3,15 @@
 , fetchFromGitHub
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalPackages: {
   pname = "durden";
-  version = "0.6.1+date=2022-03-11";
+  version = "unstable-2022-07-16";
 
   src = fetchFromGitHub {
     owner = "letoram";
-    repo = pname;
-    rev = "fec2a1051500df28becce188d932645743091efa";
-    hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA=";
+    repo = "durden";
+    rev = "4c9eaf1550d34e10565b545e0f96b1f6b8d26dcd";
+    hash = "sha256-1d+Kg17nxNQeVT/iVa5oPXu96Ivvas9AO/H+NxhB4Yo=";
   };
 
   dontConfigure = true;
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.all;
   };
-}
+})
diff --git a/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix b/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix
index 09f809aa4718..6954f157d6e8 100644
--- a/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix
+++ b/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix
@@ -3,15 +3,15 @@
 , fetchFromGitHub
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalPackages: {
   pname = "pipeworld";
-  version = "0.pre+date=2021-12-03";
+  version = "unstable-2022-04-03";
 
   src = fetchFromGitHub {
     owner = "letoram";
-    repo = pname;
-    rev = "c653414670cafb0c73a57492aa3d9510460b16a9";
-    hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk=";
+    repo = "pipeworld";
+    rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef";
+    hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E=";
   };
 
   dontConfigure = true;
@@ -47,4 +47,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.all;
   };
-}
+})
diff --git a/nixpkgs/pkgs/desktops/arcan/prio/default.nix b/nixpkgs/pkgs/desktops/arcan/prio/default.nix
index 406aea740fc4..cc5bef3c3ef8 100644
--- a/nixpkgs/pkgs/desktops/arcan/prio/default.nix
+++ b/nixpkgs/pkgs/desktops/arcan/prio/default.nix
@@ -3,13 +3,13 @@
 , fetchFromGitHub
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalPackages: {
   pname = "prio";
-  version = "0.pre+date=2018-09-13";
+  version = "unstable-2018-09-13";
 
   src = fetchFromGitHub {
     owner = "letoram";
-    repo = pname;
+    repo = finalPackages.pname;
     rev = "c3f97491339d15f063d6937d5f89bcfaea774dd1";
     hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM=";
   };
@@ -34,4 +34,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.all;
   };
-}
+})
diff --git a/nixpkgs/pkgs/desktops/arcan/xarcan/default.nix b/nixpkgs/pkgs/desktops/arcan/xarcan/default.nix
index 0668754d6aa4..b979b64a06c5 100644
--- a/nixpkgs/pkgs/desktops/arcan/xarcan/default.nix
+++ b/nixpkgs/pkgs/desktops/arcan/xarcan/default.nix
@@ -36,15 +36,15 @@
 , xtrans
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalPackages: {
   pname = "xarcan";
-  version = "0.6.0+date=2021-08-26";
+  version = "unstable-2022-06-14";
 
   src = fetchFromGitHub {
     owner = "letoram";
-    repo = pname;
-    rev = "e40f0176e495ffdad6e7405c58378df6532eb70d";
-    hash = "sha256-T+1oL7P5MTDkeSfW6OXc1OgfZ8E6e/4YRonf1eXcfIA=";
+    repo = "xarcan";
+    rev = "02111f4925453c0c545e9193c6a5e22c0d4e98c3";
+    hash = "sha256-rp2sNRbv0OZdfyqZfsv/v3TGQY5uyXWqbvlmUDd7iBk=";
   };
 
   nativeBuildInputs = [
@@ -116,4 +116,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.unix;
   };
-}
+})