From f53cd2e3ec0712503f598cb8ff8466d6358079ff Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 26 Oct 2021 15:40:49 -0300 Subject: [PATCH 1/4] "treewide" moving Arcan packages to directories It can be useful for future modifications, patches and helper scripts. --- pkgs/desktops/arcan/{arcan.nix => arcan/default.nix} | 0 pkgs/desktops/arcan/default.nix | 11 ++++++----- .../desktops/arcan/{durden.nix => durden/default.nix} | 0 .../arcan/{pipeworld.nix => pipeworld/default.nix} | 0 pkgs/desktops/arcan/{prio.nix => prio/default.nix} | 0 .../desktops/arcan/{xarcan.nix => xarcan/default.nix} | 0 6 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/desktops/arcan/{arcan.nix => arcan/default.nix} (100%) rename pkgs/desktops/arcan/{durden.nix => durden/default.nix} (100%) rename pkgs/desktops/arcan/{pipeworld.nix => pipeworld/default.nix} (100%) rename pkgs/desktops/arcan/{prio.nix => prio/default.nix} (100%) rename pkgs/desktops/arcan/{xarcan.nix => xarcan/default.nix} (100%) diff --git a/pkgs/desktops/arcan/arcan.nix b/pkgs/desktops/arcan/arcan/default.nix similarity index 100% rename from pkgs/desktops/arcan/arcan.nix rename to pkgs/desktops/arcan/arcan/default.nix diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix index 39d3e489c592..9d9f28a79538 100644 --- a/pkgs/desktops/arcan/default.nix +++ b/pkgs/desktops/arcan/default.nix @@ -9,25 +9,26 @@ rec { # Arcan - arcan = callPackage ./arcan.nix { }; + arcan = callPackage ./arcan { }; arcan-wrapped = callPackage ./wrapper.nix { }; - xarcan = callPackage ./xarcan.nix { }; + xarcan = callPackage ./xarcan { }; # Appls - durden = callPackage ./durden.nix { }; + durden = callPackage ./durden { }; durden-wrapped = callPackage ./wrapper.nix { name = "durden-wrapped"; appls = [ durden ]; }; - pipeworld = callPackage ./pipeworld.nix { }; + pipeworld = callPackage ./pipeworld { }; pipeworld-wrapped = callPackage ./wrapper.nix { name = "pipeworld-wrapped"; appls = [ pipeworld ]; }; - prio = callPackage ./prio.nix { }; + # Warning: prio is deprecated; however it works and is useful for testing + prio = callPackage ./prio { }; prio-wrapped = callPackage ./wrapper.nix { name = "prio-wrapped"; appls = [ prio ]; diff --git a/pkgs/desktops/arcan/durden.nix b/pkgs/desktops/arcan/durden/default.nix similarity index 100% rename from pkgs/desktops/arcan/durden.nix rename to pkgs/desktops/arcan/durden/default.nix diff --git a/pkgs/desktops/arcan/pipeworld.nix b/pkgs/desktops/arcan/pipeworld/default.nix similarity index 100% rename from pkgs/desktops/arcan/pipeworld.nix rename to pkgs/desktops/arcan/pipeworld/default.nix diff --git a/pkgs/desktops/arcan/prio.nix b/pkgs/desktops/arcan/prio/default.nix similarity index 100% rename from pkgs/desktops/arcan/prio.nix rename to pkgs/desktops/arcan/prio/default.nix diff --git a/pkgs/desktops/arcan/xarcan.nix b/pkgs/desktops/arcan/xarcan/default.nix similarity index 100% rename from pkgs/desktops/arcan/xarcan.nix rename to pkgs/desktops/arcan/xarcan/default.nix From cf87b5af96f22064b61656ea1e94158dcf260812 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 26 Oct 2021 15:56:52 -0300 Subject: [PATCH 2/4] Better wording on a small comment --- pkgs/desktops/arcan/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/desktops/arcan/wrapper.nix index e394e2e08976..b61c5a5becd8 100644 --- a/pkgs/desktops/arcan/wrapper.nix +++ b/pkgs/desktops/arcan/wrapper.nix @@ -24,6 +24,6 @@ symlinkJoin rec { done ''; } -# TODO: set ARCAN_FONTPATH to a set of fonts that can be provided in a parameter # TODO: set ARCAN_STATEBASEPATH to $HOME/.arcan/resources/savestates/ - possibly # via a suitable script +# TODO: set ARCAN_FONTPATH to a set of default-but-configurable fontset From 65e85478f3c87fbf17f9e119bf2b120687965009 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 26 Oct 2021 15:57:13 -0300 Subject: [PATCH 3/4] arcan.arcan: 0.6.1pre1+unstable=2021-09-05 -> 0.6.1pre1+unstable=2021-10-16 --- pkgs/desktops/arcan/arcan/default.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index a0d037725ed0..48d4f9a54813 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -36,7 +36,7 @@ , xcbutil , xcbutilwm , xz -, buildManPages ? true, ruby +, buildManpages ? true, ruby }: let @@ -52,21 +52,21 @@ let in stdenv.mkDerivation rec { pname = "arcan"; - version = "0.6.1pre1+unstable=2021-09-05"; + version = "0.6.1pre1+unstable=2021-10-16"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = "525521177e4458199d7a57f8e6d37d41c04a988d"; - hash = "sha256-RsvTHPIvF9TeOfjPGcArptIiF9g42BfZkVMCbjJcXnE="; + rev = "e0182b944152fbcb49f5c16932d38c05a9fb2680"; + hash = "sha256-4FodFuO51ehvyjH4YaF/xBY9dwA6cP/e6/BvEsH4w7U="; }; postUnpack = '' - ( - cd $sourceRoot/external/git/ - cp -a ${letoram-openal-src}/ openal/ - chmod --recursive 744 openal/ - ) + pushd . + cd $sourceRoot/external/git/ + cp -a ${letoram-openal-src}/ openal/ + chmod --recursive 744 openal/ + popd ''; # TODO: work with upstream in order to get rid of these hardcoded paths @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { cmake makeWrapper pkg-config - ] ++ lib.optionals buildManPages [ + ] ++ lib.optionals buildManpages [ ruby ]; @@ -123,8 +123,11 @@ stdenv.mkDerivation rec { # INFO: According to the source code, the manpages need to be generated before # the configure phase - preConfigure = lib.optionalString buildManPages '' - (cd doc; ruby docgen.rb mangen) + preConfigure = lib.optionalString buildManpages '' + pushd . + cd doc + ruby docgen.rb mangen + popd ''; cmakeFlags = [ From 134191380c7de09d3eb425ec4305ecb0c1f13e78 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 26 Oct 2021 16:43:00 -0300 Subject: [PATCH 4/4] arcan.durden: 0.6.1+unstable=2021-07-11 -> 0.6.1+unstable=2021-10-15 --- pkgs/desktops/arcan/durden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index f6837f96fb6b..69aae1d216a3 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+unstable=2021-07-11"; + version = "0.6.1+unstable=2021-10-15"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5"; - hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0="; + rev = "ab6cdaf19e87b74895a9ab5e1d005a07ea9396a6"; + hash = "sha256-FxqY1TUgbD/PjQjTZZerb7ngn5nkcqmVwqPvbRAYaqo="; }; installPhase = ''