From 77a820e18a5c4739fd93b85bea8c5d0d26dde94a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 31 Mar 2024 16:02:08 -0300 Subject: fvwm2: migrate to by-name --- pkgs/applications/window-managers/fvwm/2.6.nix | 82 -------------------------- 1 file changed, 82 deletions(-) delete mode 100644 pkgs/applications/window-managers/fvwm/2.6.nix (limited to 'pkgs/applications/window-managers') diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/applications/window-managers/fvwm/2.6.nix deleted file mode 100644 index e771a170c4894..0000000000000 --- a/pkgs/applications/window-managers/fvwm/2.6.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, cairo -, fontconfig -, freetype -, fribidi -, libXcursor -, libXft -, libXinerama -, libXpm -, libXt -, libpng -, librsvg -, libstroke -, libxslt -, perl -, pkg-config -, python3Packages -, readline -, enableGestures ? false -}: - -stdenv.mkDerivation rec { - pname = "fvwm"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "fvwmorg"; - repo = pname; - rev = version; - hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - python3Packages.wrapPython - ]; - - buildInputs = [ - cairo - fontconfig - freetype - fribidi - libXcursor - libXft - libXinerama - libXpm - libXt - libpng - librsvg - libxslt - perl - python3Packages.python - readline - ] ++ lib.optional enableGestures libstroke; - - pythonPath = [ - python3Packages.pyxdg - ]; - - configureFlags = [ - "--enable-mandoc" - "--disable-htmldoc" - ]; - - postFixup = '' - wrapPythonPrograms - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://fvwm.org"; - description = "A multiple large virtual desktop window manager"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ edanaher ]; - }; -} -- cgit 1.4.1 From c7ccaa7154cf44a58682d2e4857b4f132667fe1f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 31 Mar 2024 16:05:50 -0300 Subject: fvwm3: migrate to by-name --- pkgs/applications/window-managers/fvwm/3.nix | 97 ---------------------------- pkgs/by-name/fv/fvwm3/package.nix | 97 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 97 insertions(+), 99 deletions(-) delete mode 100644 pkgs/applications/window-managers/fvwm/3.nix create mode 100644 pkgs/by-name/fv/fvwm3/package.nix (limited to 'pkgs/applications/window-managers') diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix deleted file mode 100644 index 83dffa0200081..0000000000000 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, asciidoctor -, autoreconfHook -, cairo -, fontconfig -, freetype -, fribidi -, libSM -, libX11 -, libXcursor -, libXft -, libXi -, libXinerama -, libXpm -, libXrandr -, libXt -, libevent -, libintl -, libpng -, librsvg -, libstroke -, libxslt -, perl -, pkg-config -, python3Packages -, readline -, sharutils -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "fvwm3"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "fvwmorg"; - repo = "fvwm3"; - rev = finalAttrs.version; - hash = "sha256-y1buTWO1vHzloh2e4EK1dkD0uQa7lIFUbNMkEe5x6Vo="; - }; - - nativeBuildInputs = [ - autoreconfHook - asciidoctor - pkg-config - python3Packages.wrapPython - ]; - - buildInputs = [ - cairo - fontconfig - freetype - fribidi - libSM - libX11 - libXcursor - libXft - libXi - libXinerama - libXpm - libXrandr - libXt - libevent - libintl - libpng - librsvg - libstroke - libxslt - perl - python3Packages.python - readline - sharutils - ]; - - pythonPath = [ - python3Packages.pyxdg - ]; - - configureFlags = [ - "--enable-mandoc" - ]; - - postFixup = '' - wrapPythonPrograms - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://fvwm.org"; - description = "A multiple large virtual desktop window manager - Version 3"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (libX11.meta) platforms; - }; -}) diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix new file mode 100644 index 0000000000000..83dffa0200081 --- /dev/null +++ b/pkgs/by-name/fv/fvwm3/package.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, fetchFromGitHub +, asciidoctor +, autoreconfHook +, cairo +, fontconfig +, freetype +, fribidi +, libSM +, libX11 +, libXcursor +, libXft +, libXi +, libXinerama +, libXpm +, libXrandr +, libXt +, libevent +, libintl +, libpng +, librsvg +, libstroke +, libxslt +, perl +, pkg-config +, python3Packages +, readline +, sharutils +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fvwm3"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "fvwmorg"; + repo = "fvwm3"; + rev = finalAttrs.version; + hash = "sha256-y1buTWO1vHzloh2e4EK1dkD0uQa7lIFUbNMkEe5x6Vo="; + }; + + nativeBuildInputs = [ + autoreconfHook + asciidoctor + pkg-config + python3Packages.wrapPython + ]; + + buildInputs = [ + cairo + fontconfig + freetype + fribidi + libSM + libX11 + libXcursor + libXft + libXi + libXinerama + libXpm + libXrandr + libXt + libevent + libintl + libpng + librsvg + libstroke + libxslt + perl + python3Packages.python + readline + sharutils + ]; + + pythonPath = [ + python3Packages.pyxdg + ]; + + configureFlags = [ + "--enable-mandoc" + ]; + + postFixup = '' + wrapPythonPrograms + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "http://fvwm.org"; + description = "A multiple large virtual desktop window manager - Version 3"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bcfbc1d94ccf..2d529a24e07a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31076,8 +31076,6 @@ with pkgs; fvwm = fvwm2; - fvwm3 = callPackage ../applications/window-managers/fvwm/3.nix { }; - ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { jre = openjdk17.override { enableJavaFX = true; -- cgit 1.4.1