From 2756b33d07ced66570bb584b8fe9398ee3179ab8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 13:46:05 -0300 Subject: [PATCH 1/5] ftgl: 2.1.3-rc5 -> 2.4.0 --- pkgs/development/libraries/ftgl/default.nix | 33 ++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 5588e27356f..466ffcbb73a 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,28 +1,42 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub +, autoreconfHook +, doxygen +, freeglut , freetype +, GLUT , libGL , libGLU , OpenGL +, pkg-config }: stdenv.mkDerivation rec { pname = "ftgl"; - version = "2.1.3-rc5"; + version = "2.4.0"; - src = fetchurl { - url = "mirror://sourceforge/${pname}-${version}.tar.gz"; - hash = "sha256-VFjWISJFSGlXLTn4qoV0X8BdVRgAG876Y71su40mVls="; + src = fetchFromGitHub { + owner = "frankheckenbach"; + repo = "ftgl"; + rev = "v${version}"; + hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4="; }; + nativeBuildInputs = [ + autoreconfHook + doxygen + pkg-config + ]; buildInputs = [ freetype ] ++ (if stdenv.isDarwin then [ OpenGL + GLUT ] else [ libGL libGLU + freeglut ]); configureFlags = [ @@ -31,8 +45,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + install -Dm644 src/FTSize.h -t ${placeholder "out"}/include/FTGL + install -Dm644 src/FTFace.h -t ${placeholder "out"}/include/FTGL + ''; + meta = with lib; { - homepage = "https://sourceforge.net/apps/mediawiki/ftgl/"; + homepage = "https://github.com/frankheckenbach/ftgl"; description = "Font rendering library for OpenGL applications"; longDescription = '' FTGL is a free cross-platform Open Source C++ library that uses Freetype2 @@ -40,7 +59,7 @@ stdenv.mkDerivation rec { pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering modes. ''; - license = licenses.gpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1da1e9d3457..62d644faad8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4639,7 +4639,7 @@ in frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; ftgl = callPackage ../development/libraries/ftgl { - inherit (darwin.apple_sdk.frameworks) OpenGL; + inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; }; ftop = callPackage ../os-specific/linux/ftop { }; From 963a8cfe25b4df70330495b01fa970516cc54b3d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 14:13:49 -0300 Subject: [PATCH 2/5] cimg: 2.9.6 -> 2.9.7 --- pkgs/development/libraries/cimg/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 9c89279cd51..f70513e0cd0 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,28 +1,33 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.6"; + version = "2.9.7"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "sha256-RdOfog5FOw5XESyDFX68Lb2MUyCeUuPaq/0UVNTjNKo="; + sha256 = "sha256-cR2wvGtomT1cZh8wKMCfYDNuP3d1gKhHJavVnvuQ8Mc="; }; installPhase = '' + runHook preInstall install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples - install -m 644 CImg.h $out/include/ cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ cp README.txt $doc/share/doc/cimg/ + runHook postInstall ''; outputs = [ "out" "doc" ]; meta = with lib; { + homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; longDescription = '' CImg stands for Cool Image. It is easy to use, efficient and is intended @@ -30,7 +35,6 @@ stdenv.mkDerivation rec { C++. Due to its generic conception, it can cover a wide range of image processing applications. ''; - homepage = "http://cimg.eu/"; license = licenses.cecill-c; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; From 3a7af6de81eedf4de73b6487e92a88babcb03f6b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 14:38:31 -0300 Subject: [PATCH 3/5] dialog: 1.3-2210306 -> 1.3-2210324 --- pkgs/{development => }/tools/misc/dialog/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/{development => }/tools/misc/dialog/default.nix (88%) diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/tools/misc/dialog/default.nix similarity index 88% rename from pkgs/development/tools/misc/dialog/default.nix rename to pkgs/tools/misc/dialog/default.nix index dca8d9666af..744f55aed10 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/tools/misc/dialog/default.nix @@ -12,14 +12,16 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20210306"; + version = "1.3-20210324"; src = fetchurl { url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; - hash = "sha256-pz57YHtjX2PAICuzMTEG5wD5H+Sp9NJspwA/brK5yw8="; + hash = "sha256-AcLR4umvmwg+ogDKrQhP39pVF41bv05Cyf/0STUVFlM="; }; - buildInputs = [ ncurses ]; + buildInputs = [ + ncurses + ]; configureFlags = [ "--disable-rpath-hacks" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62d644faad8..c8a49492481 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2264,7 +2264,7 @@ in inherit (haskellPackages) ghcWithPackages diagrams-builder; }; - dialog = callPackage ../development/tools/misc/dialog { }; + dialog = callPackage ../tools/misc/dialog { }; dibbler = callPackage ../tools/networking/dibbler { }; From 78459891186af7cc32b0257c7abed69b59340ed9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 16:54:13 -0300 Subject: [PATCH 4/5] docutils: 0.16 -> 0.17.1 --- pkgs/development/python-modules/docutils/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index bae0acc1d45..0ccd53a9cbd 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -3,17 +3,16 @@ , fetchPypi , buildPythonPackage , isPy3k -, isPy38 , python }: buildPythonPackage rec { pname = "docutils"; - version = "0.16"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"; + hash = "sha256-aGV30uTDI4C7UMuyL1de10LVgWjO436ZEXqFS82I8SU="; }; # Only Darwin needs LANG, but we could set it in general. @@ -30,8 +29,8 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Python Documentation Utilities"; homepage = "http://docutils.sourceforge.net/"; + description = "Python Documentation Utilities"; license = with licenses; [ publicDomain bsd2 psfl gpl3Plus ]; maintainers = with maintainers; [ AndersonTorres ]; }; From 9066cb97fe27a09423db8e285fe96b875980de53 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 14:48:35 -0300 Subject: [PATCH 5/5] fme: refactor --- pkgs/applications/misc/fme/default.nix | 47 +++++++++++++++++++------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 52ba2927fd4..6f6a143ae8e 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,33 +1,56 @@ -{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext -, fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, bc +, fluxbox +, gettext +, glibmm +, gtkmm2 +, libglademm +, libsigcxx +, pkg-config +}: stdenv.mkDerivation rec { - pname = "fme"; version = "1.1.3"; src = fetchurl { url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz"; - sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; + hash = "sha256-0cgaajjA+q0ClDrWXW0DFL0gXG3oQWaaLv5D5MUD5j0="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; + nativeBuildInputs = [ + autoconf + automake + gettext + pkg-config + ]; + buildInputs = [ + bc + fluxbox + glibmm + gtkmm2 + libglademm + libsigcxx + ]; preConfigure = '' ./autogen.sh ''; meta = with lib; { + homepage = "https://github.com/rdehouss/fme/"; description = "Editor for Fluxbox menus"; longDescription = '' - Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox written in C++ - with the libraries Gtkmm, Glibmm, libglademm and gettext for internationalization. - Its user-friendly interface will help you to edit, delete, move (Drag and Drop) - a row, a submenu, etc very easily. + Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox + written in C++ with the libraries Gtkmm, Glibmm, libglademm and gettext + for internationalization. Its user-friendly interface will help you to + edit, delete, move (Drag and Drop) a row, a submenu, etc very easily. ''; - homepage = "https://github.com/rdehouss/fme/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; };