From 9120da4c4a836dc5a9fb696488ac03646f6b37d1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 14 Jan 2021 19:06:22 -0500 Subject: binutils: enable gold when cross compiling on darwin This basically reverts: - 3c5188cc ('binutils: disable gold when building on darwin') - 457b48cc ('binutils: apply patch when cross compiling from darwin') Tested by building: - nix build -f . pkgsCross.i686-embedded.buildPackages.binutils - nix build -f . pkgsCross.aarch64-embedded.buildPackages.binutils --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 559268521460..68a8bfa68cbc 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -4,7 +4,7 @@ , withAllTargets ? false, libbfd, libopcodes , enableShared ? !stdenv.hostPlatform.isStatic , noSysDirs -, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform +, gold ? true , bison ? null , flex , texinfo -- cgit v1.2.3 From 451ffe6ad07f473a8c96b752b92c822cf48a41a3 Mon Sep 17 00:00:00 2001 From: Hector Escobedo Date: Thu, 21 Jan 2021 02:54:38 -0800 Subject: prometheus-cpp: add pkgconfig data --- pkgs/development/libraries/prometheus-cpp/default.nix | 5 +++++ pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 5377d2b96d00..3714e2c89e6b 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-ldl"; + postInstall = '' + mkdir -p $out/lib/pkgconfig + substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc + ''; + meta = { description = "Prometheus Client Library for Modern C++"; homepage = "https://github.com/jupp0r/prometheus-cpp"; diff --git a/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in new file mode 100644 index 000000000000..c373f4153b55 --- /dev/null +++ b/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in @@ -0,0 +1,10 @@ +prefix=@out@ +includedir=${prefix}/include +libdir=${prefix}/lib + +Name: prometheus-cpp +Description: Prometheus Client Library for Modern C++ +URL: https://github.com/jupp0r/prometheus-cpp +Version: @version@ +Cflags: -isystem${includedir} +Libs: -Wl,-rpath,${libdir} -L${libdir} -lprometheus-cpp-core -lprometheus-cpp-pull -lprometheus-cpp-push -- cgit v1.2.3 From 23b0a88572577777d6fa4f9e5810da3c6a6e9c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 21 Jan 2021 20:16:58 +0100 Subject: rust-bindgen: Resolve "/usr/bin/env bash" to fix usage in Nix build --- pkgs/development/tools/rust/bindgen/default.nix | 10 +++++++--- pkgs/development/tools/rust/bindgen/wrapper.sh | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 0330edb4804b..eef8a5e41fd2 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, - runtimeShell }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin +, runtimeShell +, bash +}: rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; @@ -16,7 +18,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w"; - libclang = llvmPackages.libclang.lib; #for substituteAll + #for substituteAll + libclang = llvmPackages.libclang.lib; + inherit bash; buildInputs = [ libclang ]; diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/pkgs/development/tools/rust/bindgen/wrapper.sh index 95cd0901cec8..0b3e3cd4c1e0 100755 --- a/pkgs/development/tools/rust/bindgen/wrapper.sh +++ b/pkgs/development/tools/rust/bindgen/wrapper.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!@bash@/bin/bash sep='--' # whether to add -- before new options cxx=0 # whether cxx was explicitly requested lastWasx=0 # whether the last argument passed was -x -- cgit v1.2.3 From 80b13365e9a5482f4a2a1c5b150f328af54bbe15 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 21 Jan 2021 00:09:03 +0100 Subject: ocamlPackages.mirage-crypto*: 0.8.8 -> 0.8.10 ocamlPackages.x509: fix tests for mirage-crypto >= 0.8.9 --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 4 ++-- pkgs/development/ocaml-modules/x509/default.nix | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index c2ede31dd3f1..ab48e01950e6 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.8"; + version = "0.8.10"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "19czylfyakckfzzcbqgv9ygl243wix7ak8zkbdcb9hcl2k2shswb"; + sha256 = "8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 289a3891c783..23efd4bb9fcf 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage, fetchpatch , alcotest, cstruct-unix , asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk , logs, base64 @@ -15,6 +15,14 @@ buildDunePackage rec { sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22"; }; + patches = [ + # fix tests for mirage-crypto >= 0.8.9, can be removed at next release + (fetchpatch { + url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch"; + sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr"; + }) + ]; + useDune2 = true; buildInputs = [ alcotest cstruct-unix ]; -- cgit v1.2.3 From 29954335b7d9933c7846f01ff5b6d07c9fc39263 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Thu, 21 Jan 2021 11:09:20 -0800 Subject: ocamlPackages_4_12.ocaml: alpha3 -> beta1 --- pkgs/development/compilers/ocaml/4.12.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix index 16649f09869f..c422d2a15a3f 100644 --- a/pkgs/development/compilers/ocaml/4.12.nix +++ b/pkgs/development/compilers/ocaml/4.12.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0-alpha3"; + patch_version = "0-beta1"; src = fetchTarball { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz"; - sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw"; + url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~beta1.tar.xz"; + sha256 = "1rny74mi0knl8byqg2naw1mgvn22c2zihlwvzbkd56j97flqsxsm"; }; } -- cgit v1.2.3 From 2ab13ca162762e8728c3f9bdac92cd9c933ed41f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 22 Jan 2021 07:38:38 +1000 Subject: treewide: add final newline --- pkgs/development/tools/fac/deps.nix | 2 +- pkgs/development/tools/gopkgs/deps.nix | 2 +- pkgs/development/tools/kube-prompt/deps.nix | 2 +- pkgs/development/tools/tychus/deps.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix index 65335497e5ff..8545bae7e22d 100644 --- a/pkgs/development/tools/fac/deps.nix +++ b/pkgs/development/tools/fac/deps.nix @@ -63,4 +63,4 @@ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } -] \ No newline at end of file +] diff --git a/pkgs/development/tools/gopkgs/deps.nix b/pkgs/development/tools/gopkgs/deps.nix index 715c7bbbc824..e813a5b22564 100644 --- a/pkgs/development/tools/gopkgs/deps.nix +++ b/pkgs/development/tools/gopkgs/deps.nix @@ -18,4 +18,4 @@ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } -] \ No newline at end of file +] diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/pkgs/development/tools/kube-prompt/deps.nix index e2391789a41c..b8d9e200a8ca 100644 --- a/pkgs/development/tools/kube-prompt/deps.nix +++ b/pkgs/development/tools/kube-prompt/deps.nix @@ -306,4 +306,4 @@ sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s"; }; } -] \ No newline at end of file +] diff --git a/pkgs/development/tools/tychus/deps.nix b/pkgs/development/tools/tychus/deps.nix index 194aa96ae3ce..e8897efffc95 100644 --- a/pkgs/development/tools/tychus/deps.nix +++ b/pkgs/development/tools/tychus/deps.nix @@ -27,4 +27,4 @@ sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; }; } -] \ No newline at end of file +] -- cgit v1.2.3