From 1465e096ec84e6e07b4758b55dde7eab83edf9c0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 3 Aug 2022 21:46:10 -0300 Subject: [PATCH 1/5] arcanPackages.xarcan: 2021-08-26 -> 2022-06-14 --- pkgs/desktops/arcan/xarcan/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/desktops/arcan/xarcan/default.nix index 0668754d6aa4..b979b64a06c5 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/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; }; -} +}) From cfda4e3c62461aa71a8885ccf5218d96f37ec79a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 3 Aug 2022 21:44:12 -0300 Subject: [PATCH 2/5] arcanPackages.durden: 2022-05-23 -> 2022-07-16 --- pkgs/desktops/arcan/durden/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index 362e2b7082df..d5e9d0693c84 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/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-05-23"; + version = "unstable-2022-07-16"; src = fetchFromGitHub { owner = "letoram"; - repo = pname; - rev = "9284182bd8b3b976387cd6494c5f605633a559fc"; - hash = "sha256-K1MjgNyX6qlaHya6Grej0cagORihS35BWECWn2HcRCk="; + 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; }; -} +}) From 99836653a91e68c3f9c5cf9ebfe1591d7efd1702 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 3 Aug 2022 21:47:02 -0300 Subject: [PATCH 3/5] arcanPackages.pipeworld: use old version format --- pkgs/desktops/arcan/pipeworld/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index 86ab42596402..6954f157d6e8 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -3,13 +3,13 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalPackages: { pname = "pipeworld"; - version = "0.pre+date=2022-04-03"; + version = "unstable-2022-04-03"; src = fetchFromGitHub { owner = "letoram"; - repo = pname; + repo = "pipeworld"; rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef"; hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; -} +}) From d61e4954ba7f25d2cad32b5e2ed76daa0a1d8445 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 3 Aug 2022 21:55:07 -0300 Subject: [PATCH 4/5] arcanPackages.prio: use old version format --- pkgs/desktops/arcan/prio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix index 406aea740fc4..cc5bef3c3ef8 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/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; }; -} +}) From 9769e1b28a45d44d0841d8eb5d83c761dca437d5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 3 Aug 2022 22:11:51 -0300 Subject: [PATCH 5/5] arcanPackages.arcan: use new style for recursive attributes --- pkgs/desktops/arcan/arcan/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index 9623a47807d2..0cd7e4e0db64 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -52,14 +52,14 @@ , useStaticSqlite ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; version = "0.6.2"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0="; }; @@ -156,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 @@ -168,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"}" @@ -196,4 +196,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} +})