diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/opencsg/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/libraries/opencsg/fix-pro-files.patch | 21 | ||||
-rw-r--r-- | pkgs/development/python-modules/tess/default.nix | 30 | ||||
-rw-r--r-- | pkgs/development/python-modules/traits/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/database/timescaledb-tune/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
8 files changed, 90 insertions, 19 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bde6924a65e8..2b4ffd4e975c 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -246,15 +246,15 @@ in rec { tor-browser-8-0 = tbcommon rec { ffversion = "60.6.1esr"; - tbversion = "8.0.8"; + tbversion = "8.0.9"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.6.1esr-8.0-1-slnos" - rev = "dda14213c550afc522ef0bb0bb1643289c298736"; - sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz"; + # branch "tor-browser-60.6.1esr-8.0-1-r2-slnos" + rev = "d311540ce07f1f4f5e5789f9107f6e6ecc23988d"; + sha256 = "0nz8vxv53vnqyk3ahakrr5xg6sgapvlmsb6s1pwwsb86fxk6pm5f"; }; patches = [ diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index e0a6c6a5705e..11c66f0d497b 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, libGLU_combined, freeglut, glew, libXmu, libXext, libX11 - }: +, qmake, GLUT, fixDarwinDylibNames }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -9,27 +9,42 @@ stdenv.mkDerivation rec { sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; }; - buildInputs = [libGLU_combined freeglut glew libXmu libXext libX11]; + nativeBuildInputs = [ qmake ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = [ glew ] + ++ stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut libXmu libXext libX11 ] + ++ stdenv.lib.optional stdenv.isDarwin GLUT; doCheck = false; + patches = [ ./fix-pro-files.patch ]; + preConfigure = '' - sed -i 's/^\(LIBS *=.*\)$/\1 -lX11/' example/Makefile + rm example/Makefile src/Makefile + qmakeFlags="$qmakeFlags INSTALLDIR=$out" ''; - installPhase = '' - mkdir -pv "$out/"{bin,share/doc/opencsg} - - cp example/opencsgexample "$out/bin" - cp -r include lib "$out" + postInstall = '' + install -D license.txt "$out/share/doc/opencsg/license.txt" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/*.app $out/Applications + rmdir $out/bin || true + ''; - cp license.txt "$out/share/doc/opencsg" + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample + install_name_tool -change \ + $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \ + $(otool -D $out/lib/libopencsg.dylib | tail -n 1) \ + $app ''; meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; homepage = http://www.opencsg.org/; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/opencsg/fix-pro-files.patch b/pkgs/development/libraries/opencsg/fix-pro-files.patch new file mode 100644 index 000000000000..462b44c8f40c --- /dev/null +++ b/pkgs/development/libraries/opencsg/fix-pro-files.patch @@ -0,0 +1,21 @@ +diff -ur OpenCSG-1.4.2-pristine/example/example.pro OpenCSG-1.4.2/example/example.pro +--- OpenCSG-1.4.2-pristine/example/example.pro 2016-09-27 06:11:16.000000000 +0900 ++++ OpenCSG-1.4.2/example/example.pro 2019-05-07 10:45:18.785251737 +0900 +@@ -6,7 +6,9 @@ + INCLUDEPATH += ../include + LIBS += -L../lib -lopencsg -lGLEW + +-INSTALLDIR = /usr/local ++isEmpty(INSTALLDIR) { ++ INSTALLDIR = /usr/local ++} + INSTALLS += target + target.path = $$INSTALLDIR/bin + +diff -ur OpenCSG-1.4.2-pristine/opencsg.pro OpenCSG-1.4.2/opencsg.pro +--- OpenCSG-1.4.2-pristine/opencsg.pro 2016-09-27 06:11:16.000000000 +0900 ++++ OpenCSG-1.4.2/opencsg.pro 2019-05-07 10:44:50.578698165 +0900 +@@ -1,2 +1,3 @@ + TEMPLATE = subdirs + SUBDIRS = src example ++CONFIG += ordered diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix new file mode 100644 index 000000000000..987fbf010197 --- /dev/null +++ b/pkgs/development/python-modules/tess/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, numpy +, scipy +}: + +buildPythonPackage rec { + pname = "tess"; + version = "unstable-2019-05-07"; + + src = fetchFromGitHub { + owner = "wackywendell"; + repo = "tess"; + rev = "22c19df952732f9749637d1bf6d7b676b6c7b26c"; + sha256 = "0pj18nrfx749fjc6bjdk5r3g1104c6jy6xg7jrpmssllhypbb1m4"; + }; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy scipy ]; + + meta = with lib; { + description = "A module for calculating and analyzing Voronoi tessellations"; + homepage = https://tess.readthedocs.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index c6f3a127ed57..bfc3ae475ebb 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "traits"; - version = "5.0.0"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "8369117036fbbe00dbd40e1a01c8775b52bdbfa11db5788168e7c8c56663bac0"; + sha256 = "0lwmqgkjihqkf269xmdqsa302p378zjcpz01k9a98br7ngzrsj64"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 34a7ee4b66c8..9dd923173733 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "timescaledb-tune"; - version = "0.5.0"; + version = "0.6.0"; goPackagePath = "github.com/timescale/timescaledb-tune"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "timescale"; repo = name; rev = version; - sha256 = "1fs7ggpdik3qjvjmair1svni2sw9wz54716m2iwngv8x4s9b15nn"; + sha256 = "0hjxmjgkqm9sbjbyhs3pzkk1d9vvlcbzwl7ghsigh4h7rw3a0mpk"; }; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d78e83fbd9cf..57ba1ab44dcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12296,7 +12296,10 @@ in opencore-amr = callPackage ../development/libraries/opencore-amr { }; - opencsg = callPackage ../development/libraries/opencsg { }; + opencsg = callPackage ../development/libraries/opencsg { + inherit (qt5) qmake; + inherit (darwin.apple_sdk.frameworks) GLUT; + }; openct = callPackage ../development/libraries/openct { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d20ac3015d06..38d82984c488 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4346,6 +4346,8 @@ in { terminado = callPackage ../development/python-modules/terminado { }; + tess = callPackage ../development/python-modules/tess { }; + testresources = callPackage ../development/python-modules/testresources { }; testtools = callPackage ../development/python-modules/testtools { }; |