diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/by-name/ar/arcan/package.nix similarity index 90% rename from pkgs/desktops/arcan/arcan/default.nix rename to pkgs/by-name/ar/arcan/package.nix index 1a46c693b027..ce4fc7256b77 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -2,8 +2,9 @@ , stdenv , fetchFromGitHub , SDL2 +, callPackage , cmake -, espeak +, espeak-ng , ffmpeg , file , freetype @@ -54,11 +55,15 @@ let allSources = { - letoram-arcan-src = fetchFromGitHub { - owner = "letoram"; - repo = "arcan"; - rev = "85c8564bdbee8468a5716bea64daf1d78937ffbf"; - hash = "sha256-etmj1vpZTjxbmr4UiLBEK57WFJ1NeEnY5WfBYajX3ls="; + letoram-arcan = { + pname = "arcan"; + version = "0.6.2.1-unstable-2023-11-18"; + src = fetchFromGitHub { + owner = "letoram"; + repo = "arcan"; + rev = "0950ee236f96a555729498d0fdf91c16901037f5"; + hash = "sha256-TxadRlidy4KRaQ4HunPO6ISJqm6JwnMRM8y6dX6vqJ4="; + }; }; letoram-openal-src = fetchFromGitHub { owner = "letoram"; @@ -87,10 +92,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { - pname = "arcan"; - version = "0.6.2.1-unstable-2023-10-14"; - - src = allSources.letoram-arcan-src; + inherit (allSources.letoram-arcan) pname version src; nativeBuildInputs = [ cmake @@ -140,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { xz ] ++ lib.optionals useEspeak [ - espeak + espeak-ng ]; # Emulate external/git/clone.sh @@ -197,6 +199,10 @@ stdenv.mkDerivation (finalAttrs: { "format" ]; + passthru = { + wrapper = callPackage ./wrapper.nix { }; + }; + meta = { homepage = "https://arcan-fe.com/"; description = "Combined Display Server, Multimedia Framework, Game Engine"; diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/by-name/ar/arcan/wrapper.nix similarity index 100% rename from pkgs/desktops/arcan/wrapper.nix rename to pkgs/by-name/ar/arcan/wrapper.nix diff --git a/pkgs/desktops/arcan/cat9/default.nix b/pkgs/by-name/ca/cat9/package.nix similarity index 62% rename from pkgs/desktops/arcan/cat9/default.nix rename to pkgs/by-name/ca/cat9/package.nix index 7bc6005b0c65..dac6f85656dc 100644 --- a/pkgs/desktops/arcan/cat9/default.nix +++ b/pkgs/by-name/ca/cat9/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cat9"; - version = "unstable-2023-06-25"; + version = "unstable-2023-11-06"; src = fetchFromGitHub { owner = "letoram"; repo = "cat9"; - rev = "4d8a0c539a5c756acada96fd80e7eb3b9554ac05"; - hash = "sha256-T3RPuldKTzHm0EdfdMOtHv9kcr9oE9YQgdzv/jjPPnc="; + rev = "a807776a85237ab0bdd0a712fb33c176fc295e30"; + hash = "sha256-OlH8FgVBk76Qw+5mnsrryXOL9GbPJWlwUGtYlLuAPxQ="; }; dontConfigure = true; @@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/cat9"; description = "A User shell for LASH"; - license = licenses.unlicense; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ unlicense ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/by-name/du/durden/package.nix similarity index 73% rename from pkgs/desktops/arcan/durden/default.nix rename to pkgs/by-name/du/durden/package.nix index f6677b9823ff..3d72e132964a 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/by-name/du/durden/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "durden"; - version = "unstable-2023-08-11"; + version = "unstable-2023-10-23"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "728d7fc3292cc162b1cea505c8a71512b2e84925"; - hash = "sha256-UL36JeppnoFDdzdsJMsWKJL58ioz9eOaNEZp/7DGV9w="; + rev = "347dba6da011bbaa70c6edaf82a2d915f4057db3"; + hash = "sha256-iNf7fOzz7mf1CXG5leCenkSTrdCc9/KL8VLw8gUIyKE="; }; dontConfigure = true; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://durden.arcan-fe.com/"; description = "Reference Desktop Environment for Arcan"; longDescription = '' @@ -36,8 +36,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { features in Arcan, and as a very competent entry to the advanced-user side of the desktop environment spectrum. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/by-name/pi/pipeworld/package.nix similarity index 79% rename from pkgs/desktops/arcan/pipeworld/default.nix rename to pkgs/by-name/pi/pipeworld/package.nix index 9474535133fd..52c411d83777 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/by-name/pi/pipeworld/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalPackages: { pname = "pipeworld"; - version = "unstable-2023-03-02"; + version = "unstable-2023-02-05"; src = fetchFromGitHub { owner = "letoram"; repo = "pipeworld"; - rev = "9ea79f72ad500fe78b9f46e680be87eaac3bfb0e"; - hash = "sha256-/cjse6XXrdLoUB35GLgl871qINOm4SvKPTbfoBceLu0="; + rev = "edc3821404b3a1274b8a50d2fb1c6b523fbd4a1c"; + hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM="; }; dontConfigure = true; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalPackages: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/pipeworld"; description = "Dataflow 'spreadsheet' desktop environment"; longDescription = '' @@ -43,8 +43,8 @@ stdenvNoCC.mkDerivation (finalPackages: { application within another desktop as a 'substitute' for your normal terminal emulator. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/by-name/pr/prio/package.nix similarity index 82% rename from pkgs/desktops/arcan/prio/default.nix rename to pkgs/by-name/pr/prio/package.nix index f733b189757b..620e4f9382ce 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/by-name/pr/prio/package.nix @@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/prio"; description = "Plan9- Rio like Window Manager for Arcan"; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/by-name/xa/xarcan/package.nix similarity index 85% rename from pkgs/desktops/arcan/xarcan/default.nix rename to pkgs/by-name/xa/xarcan/package.nix index b979b64a06c5..fb43766e7207 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalPackages: { pname = "xarcan"; - version = "unstable-2022-06-14"; + version = "unstable-2023-11-03"; src = fetchFromGitHub { owner = "letoram"; repo = "xarcan"; - rev = "02111f4925453c0c545e9193c6a5e22c0d4e98c3"; - hash = "sha256-rp2sNRbv0OZdfyqZfsv/v3TGQY5uyXWqbvlmUDd7iBk="; + rev = "380ea856307f593535dfc8b23799938db69e31b0"; + hash = "sha256-RdizezCbJylQDkOmUdqL0lBTNLsjyvo+lKAjfZXTXf4="; }; nativeBuildInputs = [ @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalPackages: { "--with-xkb-path=${xkeyboard_config}/share/X11/xkb" ]; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/letoram"; description = "Patched Xserver that bridges connections to Arcan"; longDescription = '' @@ -112,8 +112,8 @@ stdenv.mkDerivation (finalPackages: { arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session as a window under Arcan. ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix deleted file mode 100644 index 76cc6a2a4a03..000000000000 --- a/pkgs/desktops/arcan/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs }: - -lib.makeScope pkgs.newScope (self: with self; { - # Dependencies - - espeak = pkgs.espeak-ng; - ffmpeg = pkgs.ffmpeg-full; - harfbuzz = pkgs.harfbuzzFull; - - # Arcan - - arcan = callPackage ./arcan { }; - arcan-wrapped = callPackage ./wrapper.nix { }; - xarcan = callPackage ./xarcan { }; - - # Appls - - cat9 = callPackage ./cat9 { }; - cat9-wrapped = callPackage ./wrapper.nix { - name = "cat9-wrapped"; - appls = [ cat9 ]; - }; - - durden = callPackage ./durden { }; - durden-wrapped = callPackage ./wrapper.nix { - name = "durden-wrapped"; - appls = [ durden ]; - }; - - pipeworld = callPackage ./pipeworld { }; - pipeworld-wrapped = callPackage ./wrapper.nix { - name = "pipeworld-wrapped"; - appls = [ pipeworld ]; - }; - - # 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 ]; - }; - - # One Expression to SymlinkJoin Them All - - all-wrapped = callPackage ./wrapper.nix { - name = "all-wrapped"; - appls = [ durden cat9 pipeworld ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7343be24d115..cfed3bbac467 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 antimicroX = antimicrox; # Added 2021-10-31 + arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26add450c33f..d450d8d13e51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38682,7 +38682,28 @@ with pkgs; ### DESKTOP ENVIRONMENTS - arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { }); + arcan-wrapped = arcan.wrapper.override { }; + arcan-all-wrapped = arcan.wrapper.override { + name = "arcan-all-wrapped"; + appls = [ cat9 durden pipeworld ]; + + }; + cat9-wrapped = arcan.wrapper.override { + name = "cat9-wrapped"; + appls = [ cat9 ]; + }; + durden-wrapped = arcan.wrapper.override { + name = "durden-wrapped"; + appls = [ durden ]; + }; + pipeworld-wrapped = arcan.wrapper.override { + name = "pipeworld-wrapped"; + appls = [ pipeworld ]; + }; + prio-wrapped = arcan.wrapper.override { + name = "prio-wrapped"; + appls = [ prio ]; + }; budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { });