From 9cb1d82be6b10398c70b925e56baf8578d6b906a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 11:33:26 -0400 Subject: [PATCH 1/5] zeromqpp: Init at 4.2.0 --- pkgs/development/libraries/zmqpp/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/zmqpp/default.nix diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix new file mode 100644 index 000000000000..f7e849f6a334 --- /dev/null +++ b/pkgs/development/libraries/zmqpp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }: + +stdenv.mkDerivation rec { + name = "zmqpp-${version}"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "zeromq"; + repo = "zmqpp"; + rev = version; + sha256 = "08v34q3sd8g1b95k73n7jwryb0xzwca8ib9dz8ngczqf26j8k72i"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + propagatedBuildInputs = [ zeromq ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; + license = licenses.lgpl3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ chris-martin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71ef037ab9dd..79dc32dd790e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12059,6 +12059,8 @@ with pkgs; czmq = czmq3; }; + zmqpp = callPackage ../development/libraries/zmqpp { }; + zig = callPackage ../development/compilers/zig { llvmPackages = llvmPackages_6; }; From ae429f8e5527263240b21e7641b84a7e7d6898d7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 02:10:09 -0400 Subject: [PATCH 2/5] yacas: 1.2.2 -> 1.6.1 They switched to cmake and talk about mingw cross, so I can kill crossAttrs too. --- .../science/math/yacas/default.nix | 59 +++++++++---------- .../science/math/yacas/gcc43.patch | 17 ------ 2 files changed, 27 insertions(+), 49 deletions(-) delete mode 100644 pkgs/applications/science/math/yacas/gcc43.patch diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index 0f6dc35fe0cb..c02ef73df119 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -1,44 +1,39 @@ -{stdenv, fetchurl, perl}: +{ stdenv, fetchFromGitHub, cmake, perl +, enableGui ? false, qt5 +, enableJupyter ? false, boost, jsoncpp, openssl, zmqpp +}: stdenv.mkDerivation rec { - name = "yacas-1.2.2"; + name = "yacas-${version}"; + version = "1.6.1"; - src = fetchurl { - url = "http://yacas.sourceforge.net/backups/${name}.tar.gz"; - sha256 = "1dmafm3w0lm5w211nwkfzaid1rvvmgskz7k4500pjhgdczi5sd78"; + src = fetchFromGitHub { + owner = "grzegorzmazur"; + repo = "yacas"; + rev = "v${version}"; + sha256 = "0awvlvf607r4hwl1vkhs6jq2s6ig46c66pmr4vspj2cdnypx99cc"; }; hardeningDisable = [ "format" ]; + cmakeFlags = [ + "-DENABLE_CYACAS_GUI=${if enableGui then "ON" else "OFF"}" + "-DENABLE_CYACAS_KERNEL=${if enableJupyter then "ON" else "OFF"}" + ]; + # Perl is only for the documentation - nativeBuildInputs = [ perl ]; - - patches = [ ./gcc43.patch ]; - - crossAttrs = { - # Trick to get host-built programs needed for the cross-build. - # If yacas had proper makefiles, this would not be needed. - preConfigure = '' - ./configure - pushd src - make mkfastprimes - cp mkfastprimes ../.. - popd - pushd manmake - make manripper removeduplicates - cp manripper removeduplicates ../.. - popd - ''; - preBuild = '' - cp ../mkfastprimes ../manripper ../removeduplicates src - ''; - }; + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ + ] ++ stdenv.lib.optionals enableGui (with qt5; [ qtbase qtwebkit ]) + ++ stdenv.lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ] + ; meta = { - description = "Easy to use, general purpose Computer Algebra System"; - homepage = http://yacas.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + description = "Easy to use, general purpose Computer Algebra System"; + homepage = http://www.yacas.org/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + broken = enableGui || enableJupyter; }; } diff --git a/pkgs/applications/science/math/yacas/gcc43.patch b/pkgs/applications/science/math/yacas/gcc43.patch deleted file mode 100644 index 054f80cff927..000000000000 --- a/pkgs/applications/science/math/yacas/gcc43.patch +++ /dev/null @@ -1,17 +0,0 @@ -Taken from gentoo: -http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch?rev=1.1&view=markup -Index: yacas-1.2.2-gcc43.patch -=================================================================== ---- a/manmake/manripper.cpp -+++ b/manmake/manripper.cpp -@@ -1,7 +1,8 @@ - --#include --#include -+#include -+#include - #include -+#include - #include - - using namespace std; From a1f4d033ddc30a17a982f0f5a2a3497d766c63ae Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 02:20:53 -0400 Subject: [PATCH 3/5] fossil: Remove crossAttrs TCC= (and BCC=) no longer needed as new Makefile defines with CC (and CC_FOR_BUILD). --- .../version-management/fossil/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index f46a704ea9ca..1373e13c4147 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,5 +1,7 @@ -{stdenv, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which -, tcllib, withJson ? true}: +{ stdenv +, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which +, tcllib, withJson ? true +}: stdenv.mkDerivation rec { name = "fossil-${version}"; @@ -18,11 +20,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ tcl ]; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "test"; - preCheck = '' + preCheck = stdenv.lib.optional doCheck '' export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" ''; configureFlags = if withJson then "--json" else ""; @@ -36,11 +38,6 @@ stdenv.mkDerivation rec { INSTALLDIR=$out/bin make install ''; - crossAttrs = { - doCheck = false; - makeFlags = [ "TCC=$CC" ]; - }; - meta = { description = "Simple, high-reliability, distributed software configuration management"; longDescription = '' From 1174526004cf25cc9fb0701a95c853521bad778d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 02:28:21 -0400 Subject: [PATCH 4/5] cloog-ppl: No crossAttrs needed --- pkgs/development/libraries/cloog-ppl/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 442b115a4082..0ce0af97ec94 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { touch NEWS ChangeLog AUTHORS ''; - crossAttrs = { - configureFlags = "--with-ppl=${ppl.crossDrv}"; - }; - doCheck = true; meta = { From 79adb993fbafeb89062e9b948e916d89311f7ca6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 02:32:51 -0400 Subject: [PATCH 5/5] cscope: Remove unneeded crossAttrs --- pkgs/development/tools/misc/cscope/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index b737bb7a7dab..0b1bbf5f9e4d 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -31,11 +31,6 @@ stdenv.mkDerivation rec { cp xcscope.el{,c} "$out/share/emacs/site-lisp" ''; - crossAttrs = { - postInstall = ""; - propagatedBuildInputs = [ ncurses.crossDrv ]; - }; - meta = { description = "A developer's tool for browsing source code";