From 7c26a808993b8c47dfb638ec6110e073f42ca3d6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 17:24:51 +0100 Subject: [PATCH 1/2] seexpr: 2.11 -> 3.0.1 --- pkgs/development/compilers/seexpr/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index 5dfa08c45727..f4c640710b1e 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -1,22 +1,26 @@ { lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, -bison, flex, libGLU, python2Packages +bison, flex, libGLU, python3Packages }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "seexpr"; - version = "2.11"; + version = "3.0.1"; + src = fetchFromGitHub { owner = "wdas"; repo = "SeExpr"; - rev = "v2.11"; - sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4"; + rev = "v${version}"; + sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk="; }; + cmakeFlags = [ "-DENABLE_SSE4=OFF" ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU libpng zlib qt4 python2Packages.pyqt4 bison flex ]; + buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ]; + meta = with lib; { description = "Embeddable expression evaluation engine from Disney Animation"; - homepage = "https://www.disneyanimation.com/technology/seexpr.html"; + homepage = "https://wdas.github.io/SeExpr/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; From ba5628c2ab923b9f1ecbf1bc44dabd3664fad16a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 23:39:27 +0100 Subject: [PATCH 2/2] seexpr: fmt --- pkgs/development/compilers/seexpr/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index f4c640710b1e..f13ec5174d5a 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, -bison, flex, libGLU, python3Packages +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libpng +, zlib +, qt4 +, bison +, flex +, libGLU +, python3Packages }: stdenv.mkDerivation rec { @@ -7,9 +16,9 @@ stdenv.mkDerivation rec { version = "3.0.1"; src = fetchFromGitHub { - owner = "wdas"; - repo = "SeExpr"; - rev = "v${version}"; + owner = "wdas"; + repo = "SeExpr"; + rev = "v${version}"; sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk="; };