From d88289596f5942b9ff495498a9b8f8454fb40c4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Apr 2019 03:21:59 -0700 Subject: rust-cbindgen: 0.8.0 -> 0.8.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rust-cbindgen/versions --- pkgs/development/tools/rust/cbindgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 20105f362cf0..7e73a64e1a99 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "07cizbhr02x3rh07xhs10hzzs3lmmpf61g08sa62b98cgadvs9fq"; + sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1"; }; cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb"; -- cgit 1.4.1 From 81e02cf02d183ad17f01cdfec9d26caa6c938bc6 Mon Sep 17 00:00:00 2001 From: Fernando J Pando Date: Thu, 21 Mar 2019 17:42:26 -0400 Subject: ethash: init at 0.4.2 - Tested on NixOS --- pkgs/development/libraries/ethash/default.nix | 58 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/libraries/ethash/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix new file mode 100644 index 000000000000..da2fd13465f2 --- /dev/null +++ b/pkgs/development/libraries/ethash/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, cmake, boost, cryptopp, opencl-headers, opencl-info, + openmpi, ocl-icd, mesa, gbenchmark, gtest }: + +stdenv.mkDerivation rec { + pname = "ethash"; + version = "0.4.2"; + + src = + fetchFromGitHub { + owner = "chfast"; + repo = "ethash"; + rev = "v${version}"; + sha256 = "0qiixvxbpl2gz7jh1qs8lmyk7wzv6ffnl7kckqgrpgm547nnn8zy"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + cryptopp + opencl-headers + opencl-info + openmpi + ocl-icd + mesa + ]; + + checkInputs = [ + gbenchmark + gtest + ]; + + #preConfigure = '' + # sed -i 's/GTest::main//' test/unittests/CMakeLists.txt + # cat test/unittests/CMakeLists.txt + # ln -sfv ${gtest.src}/googletest gtest + #''; + + # NOTE: disabling tests due to gtest issue + cmakeFlags = [ + "-DHUNTER_ENABLED=OFF" + "-DETHASH_BUILD_TESTS=OFF" + #"-Dbenchmark_DIR=${gbenchmark}/lib/cmake/benchmark" + #"-DGTest_DIR=${gtest.dev}/lib/cmake/GTest" + #"-DGTest_DIR=${gtest.src}/googletest" + #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake" + ]; + + meta = with stdenv.lib; { + description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; + homepage = https://github.com/ethereum/ethash; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nand0p ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4586e299d6e..e2e94823b638 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2011,6 +2011,8 @@ in colormake = callPackage ../development/tools/build-managers/colormake { }; + ethash = callPackage ../development/libraries/ethash { }; + cpuminer = callPackage ../tools/misc/cpuminer { }; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; -- cgit 1.4.1 From 8fb48ffb55e7e98e881ff260f17e3501e61da128 Mon Sep 17 00:00:00 2001 From: Fernando J Pando Date: Thu, 21 Mar 2019 17:44:40 -0400 Subject: cli11: init at 1.7.1 - Tested on NixOS --- pkgs/development/tools/misc/cli11/default.nix | 35 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/tools/misc/cli11/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix new file mode 100644 index 000000000000..904119bd6ae3 --- /dev/null +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, gtest, python, boost }: + +stdenv.mkDerivation rec { + pname = "cli11"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "CLIUtils"; + repo = "CLI11"; + rev = "v${version}"; + sha256 = "0wddck970pczk7c201i2g6s85mkv4f2f4zxy6mndh3pfz41wcs2d"; + }; + + nativeBuildInputs = [ cmake ]; + + checkInputs = [ boost python ]; + + doCheck = true; + + preConfigure = '' + rm -rfv extern/googletest + ln -sfv ${gtest.src} extern/googletest + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "CLI11 is a command line parser for C++11"; + homepage = https://github.com/CLIUtils/CLI11; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nand0p ]; + license = licenses.unfreeRedistributable; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2e94823b638..0a32827e8401 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8661,6 +8661,8 @@ in libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { }; + cli11 = callPackage ../development/tools/misc/cli11 { }; + dcadec = callPackage ../development/tools/dcadec { }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; -- cgit 1.4.1 From b5458aadc6bf893a1d9bd53358f4eff9ac90fc2a Mon Sep 17 00:00:00 2001 From: Fernando J Pando Date: Thu, 21 Mar 2019 17:46:25 -0400 Subject: jsoncpp: 1.8.4 add cmake support - Tested on NixOS --- pkgs/development/libraries/jsoncpp/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 1c62d79ed328..b543d47a050d 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,10 +1,7 @@ -{ stdenv -, fetchFromGitHub -, cmake -, python -}: +{ stdenv , fetchFromGitHub , cmake , python }: + stdenv.mkDerivation rec { - name = "jsoncpp-${version}"; + pname = "jsoncpp"; version = "1.8.4"; src = fetchFromGitHub { @@ -36,13 +33,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" + "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; meta = with stdenv.lib; { inherit version; homepage = https://github.com/open-source-parsers/jsoncpp; description = "A C++ library for interacting with JSON."; - maintainers = with maintainers; [ ttuegel cpages ]; + maintainers = with maintainers; [ ttuegel cpages nand0p ]; license = licenses.mit; platforms = platforms.all; }; -- cgit 1.4.1 From b60a8effbb3926e29484ebb69eb0892292c7fcd6 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 28 Apr 2019 18:30:50 +0200 Subject: gocode-gomod: 2019-02-12 -> 2019-03-27 --- pkgs/development/tools/gocode-gomod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 85e7c07b8cce..f93bd9d28c81 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "gocode-gomod-unstable-${version}"; - version = "2019-02-12"; - rev = "8cc90faaf4765d16de060350da41eadccc1a15d1"; + version = "2019-03-27"; + rev = "81059208699789f992bb4a4a3fedd734e335468d"; goPackagePath = "github.com/stamblerre/gocode"; -- cgit 1.4.1 From 69c6483a7460654ff0d8a7337296bebd73e7b687 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 29 Apr 2019 10:58:51 +0200 Subject: mint: 0.3.1 -> 0.5.0 --- pkgs/development/compilers/mint/default.nix | 4 ++-- pkgs/development/compilers/mint/shards.nix | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index de7e3bd6a07e..1c8e9fb7eb20 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -33,13 +33,13 @@ let }; in stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.5.0"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr"; + sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; }; nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ]; diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index fbf85ef80426..dc6866e3af3d 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -8,8 +8,8 @@ ameba = { owner = "veelenga"; repo = "ameba"; - rev = "v0.8.0"; - sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka"; + rev = "v0.9.1"; + sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj"; }; baked_file_system = { owner = "schovi"; @@ -23,23 +23,23 @@ rev = "51962dc36f9bbb1b926d557f7cb8993a6c73cc63"; sha256 = "1nwnsxm8srfw8jg0yfi2v19x6j3dadx62hq0xpxra40qcqz9dbnp"; }; - duktape = { - owner = "jessedoyle"; - repo = "duktape.cr"; - rev = "v0.14.1"; - sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1"; + dotenv = { + owner = "gdotdesign"; + repo = "cr-dotenv"; + rev = "v0.2.0"; + sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7"; }; exception_page = { owner = "crystal-loot"; repo = "exception_page"; - rev = "v0.1.1"; - sha256 = "0pimjm64p21cjhp0jhcgdmbgisx7amk8hhbkcprkbr44bj6rv9ay"; + rev = "v0.1.2"; + sha256 = "0j5ishhyriq9p339yaawrmawl9wgmp1paniq30a8d6a0568h3avq"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.24.0"; - sha256 = "0sg7gy1lbhid9y9wh77m9sd00jygk92njm4mpb7w1fq8bjnm738k"; + rev = "v0.25.1"; + sha256 = "1334i905xj6vlmp8acyybwwlaxsgmf90b59da7brzpnf28wci782"; }; kilt = { owner = "jeromegn"; @@ -50,8 +50,8 @@ radix = { owner = "luislavena"; repo = "radix"; - rev = "v0.3.8"; - sha256 = "1kn2xxj8a8j6f6g1dr0s9mkrj1xqnpzw9wnbq24mbv8ach9a1hva"; + rev = "v0.3.9"; + sha256 = "19pksfr7ddc31hvikb433jg0zav1ar93k6zmsgaf3vsrjnvia3ix"; }; string_inflection = { owner = "mosop"; -- cgit 1.4.1 From bfaebc3647bc80137c51185e2a5a332d3420831d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 30 Apr 2019 21:25:44 -0400 Subject: wasmtime: fix hash --- pkgs/development/interpreters/wasmtime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 882de562114a..33d00afd9e70 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "17k8n5xar4pvvi4prhm6c51vlim9xqwkkhysbnss299mm3fyh36h"; + cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc"; cargoPatches = [ ./cargo-lock.patch ]; -- cgit 1.4.1 From b34a9064b738c851173b0218a22c589a93dfeebd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 May 2019 01:13:47 -0500 Subject: buck: fix build --- pkgs/development/tools/build-managers/buck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index d4e5c5a38dcd..832e8e351645 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildPhase = '' ant - ./bin/buck build -c buck.release_version=${version} buck + PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck ''; installPhase = '' -- cgit 1.4.1 From 306eebea33e9e8882ceae2f6c03480e65547110c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 02:01:34 -0700 Subject: log4cplus: 2.0.3 -> 2.0.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/log4cplus/versions --- pkgs/development/libraries/log4cplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 7fb79c549be8..cc86ab19379d 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-2.0.3"; + name = "log4cplus-2.0.4"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "0rwzwskvv94cqg2nn7jsvzlak7y01k37v345fcm040klrjvkbc3w"; + sha256 = "0lh2i22znx573jchcfy4n5lrr9yjg2hd3iphhlih61zzmd67p2hc"; }; meta = { -- cgit 1.4.1 From 01ee9c8dd4fc999aaa8c5b11ac6764fa281528fe Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 1 May 2019 12:56:41 +0200 Subject: smesh: init at 6.7.6 --- pkgs/development/libraries/smesh/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/smesh/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix new file mode 100644 index 000000000000..529f910c35ae --- /dev/null +++ b/pkgs/development/libraries/smesh/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, opencascade }: + +stdenv.mkDerivation rec { + pname = "smesh"; + version = "6.7.6"; + + src = fetchFromGitHub { + owner = "tpaviot"; + repo = "smesh"; + rev = version; + sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0"; + }; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ opencascade ]; + + meta = with stdenv.lib; { + description = "Extension to OCE providing advanced meshing features"; + homepage = "https://github.com/tpaviot/smesh"; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 904fc2a01a7b..e4517eebcfa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5745,6 +5745,8 @@ in smenu = callPackage ../tools/misc/smenu { }; + smesh = callPackage ../development/libraries/smesh {}; + smugline = python3Packages.smugline; snabb = callPackage ../tools/networking/snabb { } ; -- cgit 1.4.1 From 16e5ce4058185b860bf586a1283f44141443e46e Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Wed, 1 May 2019 15:51:44 +0200 Subject: liblinear: 2.21 -> 2.30 (#60277) This release adds parameter search for l2-regularized l2-loss SVR. --- pkgs/development/libraries/liblinear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 5f295009b994..1a177dc22374 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "liblinear-${version}"; - version = "2.21"; + version = "2.30"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz"; - sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs"; + sha256 = "1b66jpg9fdwsq7r52fccr8z7nqcivrin5d8zg2f134ygqqwp0748"; }; buildPhase = '' -- cgit 1.4.1 From 8e2ab5d8dd745b17a4108ac26693ddd1d82e32dd Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 1 May 2019 18:56:15 +0900 Subject: openocd: update libftdi dependency, fix Darwin build Restrict Linux-only features to Linux and disable any feature that doesn't build on Darwin for any reason. Restrict GCC-specific cflags to GCC. --- pkgs/development/tools/misc/openocd/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index cea86f090d6a..7141fdcee7e7 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libftdi, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }: stdenv.mkDerivation rec { name = "openocd-${version}"; @@ -10,28 +10,28 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libftdi libusb1 hidapi ]; + buildInputs = [ libftdi1 libusb1 hidapi ]; configureFlags = [ "--enable-jtag_vpi" "--enable-usb_blaster_libftdi" - "--enable-amtjtagaccel" - "--enable-gw16012" + (lib.enableFeature (! stdenv.isDarwin) "amtjtagaccel") + (lib.enableFeature (! stdenv.isDarwin) "gw16012") "--enable-presto_libftdi" "--enable-openjtag_ftdi" - "--enable-oocd_trace" + (lib.enableFeature (! stdenv.isDarwin) "oocd_trace") "--enable-buspirate" - "--enable-sysfsgpio" + (lib.enableFeature stdenv.isLinux "sysfsgpio") "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-implicit-fallthrough" "-Wno-format-truncation" "-Wno-format-overflow" ]; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" rules="$out/share/openocd/contrib/60-openocd.rules" if [ ! -f "$rules" ]; then @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ln -s "$rules" "$out/etc/udev/rules.d/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"; longDescription = '' OpenOCD provides on-chip programming and debugging support with a layered @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = http://openocd.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } -- cgit 1.4.1 From 5a3652520d80baa1bc3f1108c778d47f6d3cbdc9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 1 May 2019 12:56:56 +0200 Subject: pythonPackages.pythonocc-core: init at 0.18.1 --- .../python-modules/pythonocc-core/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pythonocc-core/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix new file mode 100644 index 000000000000..b3a9cfe82ee4 --- /dev/null +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -0,0 +1,37 @@ +{ stdenv, python, fetchFromGitHub, cmake, swig, ninja, + opencascade, smesh, freetype, libGL, libGLU, libX11 }: + +stdenv.mkDerivation rec { + pname = "pythonocc-core"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "tpaviot"; + repo = "pythonocc-core"; + rev = version; + sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3"; + }; + + nativeBuildInputs = [ cmake swig ninja ]; + buildInputs = [ + python opencascade smesh + freetype libGL libGLU libX11 + ]; + + cmakeFlags = [ + "-Wno-dev" + "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" + + "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" + "-DSMESH_LIB_PATH=${smesh}/lib" + "-DPYTHONOCC_WRAP_SMESH=TRUE" + ]; + + meta = with stdenv.lib; { + description = "Python wrapper for the OpenCASCADE 3D modeling kernel"; + homepage = "https://github.com/tpaviot/pythonocc-core"; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e7a41f94687..d0ce2175cee9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -782,6 +782,10 @@ in { python-mnist = callPackage ../development/python-modules/python-mnist { }; + pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { + inherit (pkgs.xorg) libX11; + }); + python-igraph = callPackage ../development/python-modules/python-igraph { pkgconfig = pkgs.pkgconfig; igraph = pkgs.igraph; -- cgit 1.4.1 From f5be1fc8493b1f81ba1a6cecd766e072d4054c30 Mon Sep 17 00:00:00 2001 From: Andrew Miller Date: Wed, 1 May 2019 13:18:50 -0400 Subject: hy: 0.15 -> 0.16 (#57882) * hy: 0.15 -> 0.16 * hy: fetch patch directly from upstream repo * hy: remove in-tree patch --- pkgs/development/interpreters/hy/default.nix | 16 +++++++++++++--- .../python-modules/fastentrypoints/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/fastentrypoints/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 02ce07bdf471..12631cee38ae 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1"; + sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd"; }; + patches = [ + (fetchpatch { + name = "bytecode-error-handling.patch"; + url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch"; + sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92"; + excludes = [ "AUTHORS" "NEWS.rst" ]; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ appdirs astor clint + fastentrypoints funcparserlib rply ]; diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix new file mode 100644 index 000000000000..4a921b2390d7 --- /dev/null +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "fastentrypoints"; + version = "0.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "02s1j8i2dzbpbwgq2a3fiqwm3cnmhii2qzc0k42l0rdxd4a4ya7z"; + }; + + meta = with stdenv.lib; { + description = "Makes entry_points specified in setup.py load more quickly"; + homepage = https://github.com/ninjaaron/fast-entry_points; + license = licenses.bsd2; + maintainers = with maintainers; [ nixy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0ce2175cee9..e1ca6714b291 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1919,6 +1919,8 @@ in { fastcache = callPackage ../development/python-modules/fastcache { }; + fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; + functools32 = callPackage ../development/python-modules/functools32 { }; future-fstrings = callPackage ../development/python-modules/future-fstrings { }; -- cgit 1.4.1 From bd81420cf5c21ee9317d8e7789cfd23e17c077db Mon Sep 17 00:00:00 2001 From: Milan Pässler Date: Thu, 2 May 2019 02:37:35 +0200 Subject: gem-config: add idn-ruby, rpam2, cld3 --- pkgs/development/ruby-modules/gem-config/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index cb7a2f19b5e3..4e2de5c9caf2 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib, libopus +, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf , libselinux ? null, libsepol ? null }@args: @@ -79,6 +79,11 @@ in buildInputs = [ which icu zlib ]; }; + cld3 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ protobuf ]; + }; + curb = attrs: { buildInputs = [ curl ]; }; @@ -201,6 +206,10 @@ in buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + idn-ruby = attrs: { + buildInputs = [ libidn ]; + }; + # disable bundle install as it can't install anything in addition to what is # specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R # to compensate for read-only files in site_template in nix store. @@ -340,6 +349,10 @@ in buildInputs = [ imagemagick which ]; }; + rpam2 = attrs: { + buildInputs = [ linux-pam ]; + }; + ruby-libvirt = attrs: { buildInputs = [ libvirt pkgconfig ]; buildFlags = [ -- cgit 1.4.1 From ebbf0ec5e34004f3675670b86ef3c27b9f4fdd45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 18:34:53 -0700 Subject: pmd: 6.13.0 -> 6.14.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pmd/versions --- pkgs/development/tools/analysis/pmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index ab00573965e8..5294bb46f18d 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.13.0"; + version = "6.14.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "1g8ds38zwprjswm71y7l10l15rbh2s6ha9xpp20wjy823q9agbpq"; + sha256 = "0k40l93fxakms9vm641d4vlb68gfhkblrm24sb7slzvhq2v832dj"; }; installPhase = '' -- cgit 1.4.1