diff options
author | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-12-02 16:04:32 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-02 16:04:32 -0800 |
commit | 571cbf3d1db477058303cef8754fb85a14e90eb7 (patch) | |
tree | 4e27750e24b51b0308574496b6f28200faaece1d /pkgs/development/libraries | |
parent | 3bf91048f85654c6dec62bbbf4e79a85beda3bb0 (diff) | |
parent | 987163192b0991a76c413693f7040d01460cd5e4 (diff) | |
download | nixpkgs-571cbf3d1db477058303cef8754fb85a14e90eb7.tar nixpkgs-571cbf3d1db477058303cef8754fb85a14e90eb7.tar.gz nixpkgs-571cbf3d1db477058303cef8754fb85a14e90eb7.tar.bz2 nixpkgs-571cbf3d1db477058303cef8754fb85a14e90eb7.tar.lz nixpkgs-571cbf3d1db477058303cef8754fb85a14e90eb7.tar.xz nixpkgs-571cbf3d1db477058303cef8754fb85a14e90eb7.tar.zst nixpkgs-571cbf3d1db477058303cef8754fb85a14e90eb7.zip |
Merge pull request #147092 from NixOS/staging-next
staging-next: 2021-11-22
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/setup-hook.sh | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/gmp/4.3.2.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/gmp/5.1.x.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libnetfilter_log/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libnftnl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libuninameslist/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/p11-kit/default.nix | 6 | ||||
-rwxr-xr-x | pkgs/development/libraries/physics/lhapdf/maintainer.sh | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/slib/setup-hook.sh | 10 |
12 files changed, 46 insertions, 37 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index bdfd00009dc..ecf9793b91f 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -1,16 +1,16 @@ findGdkPixbufLoaders() { - # choose the longest loaders.cache - local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" - if [[ -f "$loadersCache" ]]; then - if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then - if (( "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" )); then - export GDK_PIXBUF_MODULE_FILE="$loadersCache" - fi - else - export GDK_PIXBUF_MODULE_FILE="$loadersCache" - fi - fi + # choose the longest loaders.cache + local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + if [[ -f "$loadersCache" ]]; then + if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then + if (( "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" )); then + export GDK_PIXBUF_MODULE_FILE="$loadersCache" + fi + else + export GDK_PIXBUF_MODULE_FILE="$loadersCache" + fi + fi } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index ce870581f5e..50e26b4c132 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, m4, cxx ? true }: let self = stdenv.mkDerivation rec { - name = "gmp-4.3.2"; + pname = "gmp"; + version = "4.3.2"; src = fetchurl { - url = "mirror://gnu/gmp/${name}.tar.bz2"; + url = "mirror://gnu/gmp/gmp-${version}.tar.bz2"; sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck"; }; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index ea6a7ee4231..aa3704eb0b5 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -6,10 +6,11 @@ let inherit (lib) optional; in let self = stdenv.mkDerivation rec { - name = "gmp-5.1.3"; + pname = "gmp"; + version = "5.1.3"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv - urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; + urls = [ "mirror://gnu/gmp/gmp-${version}.tar.bz2" "ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.bz2" ]; sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m"; }; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 6228b6aaab9..59bc98aa559 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -12,10 +12,11 @@ let inherit (lib) optional; in let self = stdenv.mkDerivation rec { - name = "gmp-6.2.1"; + pname = "gmp"; + version = "6.2.1"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv - urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; + urls = [ "mirror://gnu/gmp/gmp-${version}.tar.bz2" "ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.bz2" ]; sha256 = "0z2ddfiwgi0xbf65z4fg4hqqzlhv0cc6hdcswf3c6n21xdmk5sga"; }; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index ace18afdeed..0d39abe1ac3 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -51,8 +51,10 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; configureFlags = - lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" - ++ [ + lib.optionals stdenv.isLinux [ + "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" + "--with-default-trust-store-pkcs11=pkcs11:" + ] ++ [ "--disable-dependency-tracking" "--enable-fast-install" "--with-unbound-root-key-file=${dns-root-data}/root.key" diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 4ac20cf29cb..aadc3d92b59 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libnetfilter_log"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2"; - sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; + sha256 = "1spy9xs41v76kid5ana8n126f3mvgq6fjibbfbj4kn0larbhix73"; }; buildInputs = [ libmnl ]; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 276ee52ed54..2c351181ee2 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.2.1"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "1xblq1cbcxhr6qmjpy98i1qdza148idgz99vbhjc7s4vzvfizc4h"; + sha256 = "0z4khm2mnys9mcl8ckwf19cw20jgrv8650nfncy3xcgs2k2aa23m"; }; nativeBuildInputs = [ pkg-config ]; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "http://netfilter.org/projects/libnftnl"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz ajs124 ]; }; } diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 90ea1947cb5..cd615ed81fe 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20210917"; + version = "20211114"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-bwMgNK3DhhWjijush27265Q1UoZOw7T17fKsaR6IV14="; + sha256 = "sha256-izxG2mx+D83s78eL19ERUaLrw9FPjlJRcFZw3+xzLDQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 05935e65ea0..a5d41d48629 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.2.5"; + version = "21.2.6"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,7 +47,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1fxcdf4qs4vmyjcns7jv62w4jy3gr383ar5b7mr77nb0nxgmhjcf"; + sha256 = "0m69h3f9fr66h6xjxfc485zfdci6kl8j24ab0kx5k23f7kcj4zhy"; }; # TODO: diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 4ddc01ee6b2..34a3788d786 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - "--with-trust-paths=/etc/ssl/trust-source:/etc/ssl/certs/ca-certificates.crt" + "--with-trust-paths=${lib.concatStringsSep ":" [ + "/etc/ssl/trust-source" # p11-kit trust source + "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... + "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS + ]}" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh index 92c225f90cc..6e263dcebfd 100755 --- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -7,7 +7,7 @@ set -xe BASE_URL="https://lhapdfsets.web.cern.ch/lhapdfsets/current/" for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -e "s/.*<a href=\"\([^\"/]*.tar.gz\)\".*/\1/;tx;d;:x" | sort -u`; do - echo -n " \"${pdf_set%.tar.gz}\" = \"" - nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n' - echo "\";" + echo -n " \"${pdf_set%.tar.gz}\" = \"" + nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n' + echo "\";" done diff --git a/pkgs/development/libraries/slib/setup-hook.sh b/pkgs/development/libraries/slib/setup-hook.sh index 3c7e91e8188..e820d80e7a4 100644 --- a/pkgs/development/libraries/slib/setup-hook.sh +++ b/pkgs/development/libraries/slib/setup-hook.sh @@ -1,12 +1,12 @@ addSlibPath () { if test -f "$1/lib/slib/slibcat" then - export SCHEME_LIBRARY_PATH="$1/lib/slib/" - echo "SLIB found in \`$1'; setting \$SCHEME_LIBRARY_PATH to \`$SCHEME_LIBRARY_PATH'" + export SCHEME_LIBRARY_PATH="$1/lib/slib/" + echo "SLIB found in \`$1'; setting \$SCHEME_LIBRARY_PATH to \`$SCHEME_LIBRARY_PATH'" - # This is needed so that `(load-from-path "slib/guile.init")' works. - export GUILE_LOAD_PATH="$1/lib:$GUILE_LOAD_PATH" - echo "SLIB: setting \$GUILE_LOAD_PATH to \`$GUILE_LOAD_PATH'" + # This is needed so that `(load-from-path "slib/guile.init")' works. + export GUILE_LOAD_PATH="$1/lib:$GUILE_LOAD_PATH" + echo "SLIB: setting \$GUILE_LOAD_PATH to \`$GUILE_LOAD_PATH'" fi } |