From bed68ed344d9e7a7cfebf0a1b653c82ca05aff85 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 19:32:29 +0200 Subject: [PATCH 1/7] Add *guibou* in maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3116336db902..e7bf217ac1d5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -248,6 +248,7 @@ grburst = "Julius Elias "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; + guibou = "Guillaume Bouchard "; guillaumekoenig = "Guillaume Koenig "; guyonvarch = "Joris Guyonvarch "; hakuch = "Jesse Haber-Kucharsky "; From 7f83bf42617ad296fb29346ecf44bf8811fc633c Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 21:51:15 +0200 Subject: [PATCH 2/7] ptex: init at 2.1.28 --- pkgs/development/libraries/ptex/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/ptex/default.nix diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix new file mode 100644 index 000000000000..7774cdbcb888 --- /dev/null +++ b/pkgs/development/libraries/ptex/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, zlib, python, cmake }: + +stdenv.mkDerivation rec +{ + name = "ptex-${version}"; + version = "2.1.28"; + + src = fetchFromGitHub { + owner = "wdas"; + repo = "ptex"; + rev = "v${version}"; + sha256 = "1h6gb3mpis4m6ph7h9q764w50f9jrar3jz2ja76rn5czy6wn318x"; + }; + + outputs = [ "bin" "dev" "out" "lib" ]; + + buildInputs = [ zlib python cmake ]; + + sourceRoot = "ptex-v${version}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir -p $out + + make prefix=$out + + mkdir -p $bin/bin + mkdir -p $dev/include + mkdir -p $lib/lib + ''; + + installPhase = '' + make install + mv $out/bin $bin/ + ''; + + meta = with stdenv.lib; { + description = "Per-Face Texture Mapping for Production Rendering"; + homepage = "http://ptex.us/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bef03ff8365..4bacea9dde83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15740,6 +15740,8 @@ with pkgs; polybar = callPackage ../applications/misc/polybar { }; + ptex = callPackage ../development/libraries/ptex {}; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; From db6e674bc8b078a9f540e3cecc9482b45e9f1ff1 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:00:38 +0200 Subject: [PATCH 3/7] alembic: init at 1.7.4 --- .../development/libraries/alembic/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/alembic/default.nix diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix new file mode 100644 index 000000000000..4ab09f5bb1d5 --- /dev/null +++ b/pkgs/development/libraries/alembic/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5 }: + +stdenv.mkDerivation rec +{ + name = "alembic-${version}"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "alembic"; + repo = "alembic"; + rev = "${version}"; + sha256 = "00r6d8xk2sq5hdl5lp14nhyh1b2d68fxpzbm69fk6iq2f2gv0iqv"; + }; + + outputs = [ "bin" "dev" "out" "lib" ]; + + buildInputs = [ unzip cmake openexr hdf5 ]; + + sourceRoot = "${name}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + cmake -DUSE_HDF5=ON -DCMAKE_INSTALL_PREFIX=$out/ -DUSE_TESTS=OFF . + + mkdir $out + mkdir -p $bin/bin + mkdir -p $dev/include + mkdir -p $lib/lib + ''; + + installPhase = '' + make install + + mv $out/bin $bin/ + mv $out/lib $lib/ + mv $out/include $dev/ + ''; + + meta = with stdenv.lib; { + description = "An open framework for storing and sharing scene data"; + homepage = "http://alembic.io/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bacea9dde83..0497dedf976e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13621,6 +13621,8 @@ with pkgs; airwave = callPackage ../applications/audio/airwave/default.nix { }; + alembic = callPackage ../development/libraries/alembic {}; + alchemy = callPackage ../applications/graphics/alchemy { }; alock = callPackage ../misc/screensavers/alock { }; From 3cbecaadc21e20ae54b347534b88b9566380b077 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:16:04 +0200 Subject: [PATCH 4/7] partio: init at 1.1.0 --- pkgs/development/libraries/partio/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/partio/default.nix diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix new file mode 100644 index 000000000000..ed0f38f8538b --- /dev/null +++ b/pkgs/development/libraries/partio/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, mesa, zlib, swig, python, doxygen, xorg }: + +stdenv.mkDerivation rec +{ + name = "partio-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "wdas"; + repo = "partio"; + rev = "v${version}"; + sha256 = "0z7n5ay21ca7g7xb80v6jmr96x9k7vm7zawawvmx71yj32rg1n34"; + }; + + outputs = [ "dev" "out" "lib" ]; + + buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; + + sourceRoot = "partio-v${version}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + sed 's/ADD_LIBRARY (partio /ADD_LIBRARY (partio SHARED /' -i ../src/lib/CMakeLists.txt + CXXFLAGS="-std=c++11" cmake . + make partio + + mkdir $dev + mkdir -p $lib/lib + mkdir $out + ''; + + # TODO: + # Sexpr support + + installPhase = '' + mkdir $dev/lib + mkdir -p $dev/include/partio + + mv lib/libpartio.so $lib/lib + + mv ../src/lib/* $dev/include/partio + ''; + + meta = with stdenv.lib; { + description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; + homepage = "https://www.disneyanimation.com/technology/partio.html"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0497dedf976e..78db19cc43f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15724,6 +15724,8 @@ with pkgs; ruby = ruby_2_1; }; + partio = callPackage ../development/libraries/partio {}; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; pcmanfm-qt = lxqt.pcmanfm-qt; From d99e00c9d88fa2f26ee192a2706153bd6d61668d Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:32:03 +0200 Subject: [PATCH 5/7] openfx: init at 1.4 --- pkgs/development/libraries/openfx/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/openfx/default.nix diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix new file mode 100644 index 000000000000..42edb1958ce0 --- /dev/null +++ b/pkgs/development/libraries/openfx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, unzip }: + +stdenv.mkDerivation rec +{ + name = "openfx-${version}"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "ofxa"; + repo = "openfx"; + rev = "OFX_Release_1_4_TAG"; + sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; + }; + + buildInputs = [ unzip ]; + + outputs = [ "dev" "out" ]; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir $dev + mkdir $out + ''; + + installPhase = '' + mkdir -p $dev/include/OpenFX/ + cp -r include/* $dev/include/OpenFX/ + ''; + + meta = with stdenv.lib; { + description = "Image processing plug-in standard"; + homepage = "http://openeffects.org/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78db19cc43f7..754392b5e99a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15890,6 +15890,8 @@ with pkgs; opencpn = callPackage ../applications/misc/opencpn { }; + openfx = callPackage ../development/libraries/openfx {}; + openimageio = callPackage ../applications/graphics/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; From afc6a8a25944e5d980cdf41a6b7a22760ab2595e Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:31:28 +0200 Subject: [PATCH 6/7] openexrid-unstable: init at 2017-09-17 --- .../libraries/openexrid-unstable/default.nix | 50 +++++++++++++++++++ .../openexrid-unstable/openexrid.patch | 35 +++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 87 insertions(+) create mode 100644 pkgs/development/libraries/openexrid-unstable/default.nix create mode 100644 pkgs/development/libraries/openexrid-unstable/openexrid.patch diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix new file mode 100644 index 000000000000..fcf4c2c2468f --- /dev/null +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, mesa, openexr }: + +stdenv.mkDerivation rec +{ + name = "openexrid-unstable-${version}"; + version = "2017-09-17"; + + src = fetchFromGitHub { + owner = "MercenariesEngineering"; + repo = "openexrid"; + rev = "bec0081548a096f9bcdd1504970c96264b0fc050"; + sha256 = "0h4b74lv59p4hhrvrqdmlnchn2i0v5id4kl8xc7j26l9884q0383"; + }; + + outputs = [ "dev" "out" "lib" ]; + + patches = [ ./openexrid.patch ]; + + NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR + -I${openexr.dev}/include/OpenEXR + -I${openfx.dev}/include/OpenFX + ''; + + buildInputs = [ unzip re2 openfx zlib ilmbase mesa openexr ]; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir openexrid/release + + PREFIX=$out make -C openexrid install + + mkdir $dev; + mkdir $lib; + ''; + + installPhase = '' + find $out + mv $out/include $dev/ + mv $out/lib $lib/ + ''; + + meta = with stdenv.lib; { + description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; + homepage = "https://github.com/MercenariesEngineering/openexrid"; + maintainers = [ maintainers.guibou ]; + platforms = platforms.all; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/pkgs/development/libraries/openexrid-unstable/openexrid.patch new file mode 100644 index 000000000000..bbbf75b575dc --- /dev/null +++ b/pkgs/development/libraries/openexrid-unstable/openexrid.patch @@ -0,0 +1,35 @@ +diff --git a/makefile b/makefile +index 7a92771..31ef664 100644 +--- a/makefile ++++ b/makefile +@@ -8,8 +8,8 @@ _openexrid: + _openfx: + make -C openfx + +-_test: _openexrid +- make -C test ++#_test: _openexrid ++# make -C test + + clean: + make -C openfx clean +diff --git a/makefile.config b/makefile.config +index 0c6cdfa..0166c4c 100644 +--- a/makefile.config ++++ b/makefile.config +@@ -4,7 +4,7 @@ + + PREFIX ?= ~/openexrid + +-OFX_INCLUDE ?= /usr/include/openfx ++OFX_INCLUDE ?= /usr/include/OpenFX + EXR_INCLUDE ?= /usr/include/OpenEXR + EXR_LIB ?= /usr/lib + RE2_INCLUDE ?= /usr/include +@@ -13,5 +13,5 @@ RE2_LIB ?= /usr/lib + VERSION ?= release + CPPFLAGS += -O3 -Wall -DNDEBUG -fPIC -I $(EXR_INCLUDE) -I $(OFX_INCLUDE) -I $(RE2_INCLUDE) -Dlinux + LDFLAGS += -L$(EXR_LIB) -L$(RE2_LIB) -L../openexrid/$(VERSION) -lpthread +-LDFLAGS += -Wl,-Bstatic -lopenexrid -lIlmImf -lIlmThread -lIex -lImath -lHalf -lz -lre2 -Wl,-Bdynamic ++LDFLAGS += -lopenexrid -lIlmImf -lIlmThread -lIex -lImath -lHalf -lz -lre2 -Wl,-Bdynamic + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 754392b5e99a..3fe803219451 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10032,6 +10032,8 @@ with pkgs; openexr = callPackage ../development/libraries/openexr { }; + openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; + openldap = callPackage ../development/libraries/openldap { }; opencolorio = callPackage ../development/libraries/opencolorio { }; From 41b06c1519533a51e356c6d53b0005ba21c1c901 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 17 Sep 2017 22:42:14 +0200 Subject: [PATCH 7/7] openvdb: init at 4.0.2 --- .../development/libraries/openvdb/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/openvdb/default.nix diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix new file mode 100644 index 000000000000..b172b82a295c --- /dev/null +++ b/pkgs/development/libraries/openvdb/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: + +stdenv.mkDerivation rec +{ + name = "openvdb-${version}"; + version = "4.0.2"; + + src = fetchFromGitHub { + owner = "dreamworksanimation"; + repo = "openvdb"; + rev = "v${version}"; + sha256 = "0kqlsfa9rdpxpw7v61vfknvs11axh196ilqk6bnyyfkslmmcak45"; + }; + + outputs = [ "out" ]; + + buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; + + sourceRoot = "openvdb-v${version}-src/openvdb"; + + installTargets = "install_lib"; + + enableParallelBuilding = true; + + buildFlags = ''lib + DESTDIR=$(out) + HALF_LIB=-lHalf + TBB_LIB=-ltbb + BLOSC_LIB=-lblosc + LOG4CPLUS_LIB= + BLOSC_INCLUDE_DIR=${c-blosc}/include/ + BLOSC_LIB_DIR=${c-blosc}/lib/ + ''; + + installFlags = ''DESTDIR=$(out)''; + + NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; + NIX_LDFLAGS="-lboost_iostreams"; + + meta = with stdenv.lib; { + description = "An open framework for voxel"; + homepage = "http://www.openvdb.org"; + maintainers = [ maintainers.guibou ]; + platforms = platforms.all; + license = licenses.mpl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe803219451..0aaa727286d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10058,6 +10058,8 @@ with pkgs; openslp = callPackage ../development/libraries/openslp {}; + openvdb = callPackage ../development/libraries/openvdb {}; + inherit (callPackages ../development/libraries/libressl { }) libressl_2_5 libressl_2_6;