From 548cba4ab5495404d7451f2c5be34f5aff9be560 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 3 Mar 2021 23:25:18 -0300 Subject: [PATCH 1/4] icewm: cleanup --- .../window-managers/icewm/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 571c13e9461..8f1a920296a 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , pkg-config -, perl , asciidoc , expat , fontconfig @@ -34,21 +34,26 @@ , libxcb , mkfontdir , pcre +, perl }: stdenv.mkDerivation rec { pname = "icewm"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-n9mLD1WrHsO9W1rxopFQENxQEHp/sxuixV3PxLp2vOY="; + hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4="; }; - nativeBuildInputs = [ cmake pkg-config perl asciidoc ]; - + nativeBuildInputs = [ + asciidoc + cmake + perl + pkg-config + ]; buildInputs = [ expat fontconfig @@ -90,6 +95,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://www.ice-wm.org/"; description = "A simple, lightweight X window manager"; longDescription = '' IceWM is a window manager for the X Window System. The goal of IceWM is @@ -104,8 +110,7 @@ stdenv.mkDerivation rec { includes an optional external background wallpaper manager with transparency support, a simple session manager and a system tray. ''; - homepage = "https://www.ice-wm.org/"; - license = licenses.lgpl2; + license = licenses.lgpl2Only; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; From 5f935b5625b9d5decaf2018830c6c43b9d1045c2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 3 Mar 2021 15:47:24 -0300 Subject: [PATCH 2/4] librep: cleanup --- pkgs/development/libraries/librep/default.nix | 50 ++++++++++++------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 74c45f00adc..cd007c5fe57 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -1,37 +1,49 @@ -{ lib, stdenv, fetchurl -, pkg-config, autoreconfHook -, readline, texinfo -, gdbm, gmp, libffi }: - -with lib; +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gdbm +, gmp +, libffi +, pkg-config +, readline +, texinfo +}: stdenv.mkDerivation rec { pname = "librep"; version = "0.92.7"; - sourceName = "librep_${version}"; src = fetchurl { - url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/${pname}/${pname}_${version}.tar.xz"; sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ readline texinfo ]; - propagatedBuildInputs = [ gdbm gmp libffi ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + texinfo + ]; + buildInputs = [ + gdbm + gmp + libffi + readline + ]; setupHook = ./setup-hook.sh; - meta = { + meta = with lib;{ + homepage = "http://sawfish.tuxfamily.org/"; description = "Fast, lightweight, and versatile Lisp environment"; longDescription = '' - librep is a Lisp system for UNIX, comprising an - interpreter, a byte-code compiler, and a virtual - machine. It can serve as an application extension language - but is also suitable for standalone scripts. - ''; - homepage = "http://sawfish.wikia.com"; - license = licenses.gpl2; + librep is a Lisp system for UNIX, comprising an interpreter, a byte-code + compiler, and a virtual machine. It can serve as an application extension + language but is also suitable for standalone scripts. + ''; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } # TODO: investigate fetchFromGithub From d8acd4dabe6e82c8d782dd3f58994e746baeb800 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 3 Mar 2021 15:47:49 -0300 Subject: [PATCH 3/4] rep-gtk: cleanup --- .../development/libraries/rep-gtk/default.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 618c91421b6..433da05d088 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -1,30 +1,40 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gtk2 +, librep +, pkg-config +}: -with lib; stdenv.mkDerivation rec { - pname = "rep-gtk"; version = "0.90.8.3"; - sourceName = "rep-gtk_${version}"; src = fetchurl { - url = "https://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/librep/${pname}/${pname}_${version}.tar.xz"; sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ]; - propagatedBuildInputs = [ librep gtk2 ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + gtk2 + librep + ]; patchPhase = '' sed -e 's|installdir=$(repexecdir)|installdir=$(libdir)/rep|g' -i Makefile.in ''; - meta = { + meta = with lib; { + homepage = "http://sawfish.tuxfamily.org"; description = "GTK bindings for librep"; - homepage = "http://sawfish.wikia.com"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } # TODO: investigate fetchFromGithub From 1a5a29b0165303f0f57a5d0b251743a426bab1d0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 2 Mar 2021 22:00:28 -0300 Subject: [PATCH 4/4] sawfish: cleanup A cleanup and reformatting. --- .../window-managers/sawfish/default.nix | 76 +++++++++++++------ 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 7615c6c4bd8..cb76f0c465c 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config -, which , autoreconfHook -, rep-gtk -, pango , gdk-pixbuf-xlib -, imlib , gettext -, texinfo +, gtk2 +, imlib +, libICE +, libSM , libXinerama , libXrandr , libXtst -, libICE -, libSM +, librep , makeWrapper +, pango +, pkg-config +, rep-gtk +, texinfo +, which }: stdenv.mkDerivation rec { @@ -26,20 +29,42 @@ stdenv.mkDerivation rec { sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ which - rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo - libXinerama libXrandr libXtst libICE libSM - makeWrapper ]; + nativeBuildInputs = [ + autoreconfHook + gettext + librep + makeWrapper + pkg-config + texinfo + which + ]; + buildInputs = [ + gdk-pixbuf-xlib + gtk2 + imlib + libICE + libSM + libXinerama + libXrandr + libXtst + librep + pango + rep-gtk + ]; - patchPhase = '' + postPatch = '' sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in sed -e 's|$(repexecdir)|$(libdir)/rep|g' -i src/Makefile.in ''; + strictDeps = true; + postInstall = '' - for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about \ - $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do + for i in $out/lib/sawfish/sawfish-menu \ + $out/bin/sawfish-about \ + $out/bin/sawfish-client \ + $out/bin/sawfish-config \ + $out/bin/sawfish; do wrapProgram $i \ --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ --set REP_LOAD_PATH "$out/share/sawfish/lisp" @@ -47,16 +72,17 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "http://sawfish.tuxfamily.org/"; description = "An extensible, Lisp-based window manager"; longDescription = '' - Sawfish is an extensible window manager using a Lisp-based scripting language. - Its policy is very minimal compared to most window managers. Its aim is simply - to manage windows in the most flexible and attractive manner possible. - All high-level WM functions are implemented in Lisp for future extensibility - or redefinition. + Sawfish is an extensible window manager using a Lisp-based scripting + language. Its policy is very minimal compared to most window managers. Its + aim is simply to manage windows in the most flexible and attractive manner + possible. All high-level WM functions are implemented in Lisp for future + extensibility or redefinition. ''; - homepage = "https://sawfish.fandom.com/wiki/Main_Page"; - license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; }