movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge branch 'staging' into staging-next

Browse source
This commit is contained in:
Vladimír Čunát 2022-08-25 13:40:49 +02:00
commit 38296aa965
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
119 changed files with 855 additions and 630 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View file

@ -130,6 +130,11 @@
slick-greeter as lightdm greeter to match upstream.
</para>
</listitem>
<listitem>
<para>
OpenSSL now defaults to OpenSSL 3, updated from 1.1.1.
</para>
</listitem>
<listitem>
<para>
<literal>hardware.nvidia</literal> has a new option

2
nixos/doc/manual/release-notes/rl-2211.section.md
View file

@ -53,6 +53,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to
blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream.
- OpenSSL now defaults to OpenSSL 3, updated from 1.1.1.
- `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

1
nixos/tests/all-tests.nix
View file

@ -543,6 +543,7 @@ in {
systemd-analyze = handleTest ./systemd-analyze.nix {};
systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {};
systemd-boot = handleTest ./systemd-boot.nix {};
systemd-bpf = handleTest ./systemd-bpf.nix {};
systemd-confinement = handleTest ./systemd-confinement.nix {};
systemd-coredump = handleTest ./systemd-coredump.nix {};
systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {};

1
nixos/tests/installed-tests/default.nix
View file

@ -98,6 +98,7 @@ in
gnome-photos = callInstalledTest ./gnome-photos.nix {};
graphene = callInstalledTest ./graphene.nix {};
gsconnect = callInstalledTest ./gsconnect.nix {};
json-glib = callInstalledTest ./json-glib.nix {};
ibus = callInstalledTest ./ibus.nix {};
libgdata = callInstalledTest ./libgdata.nix {};
librsvg = callInstalledTest ./librsvg.nix {};

5
nixos/tests/installed-tests/json-glib.nix Normal file
View file

@ -0,0 +1,5 @@
{ pkgs, makeInstalledTest, ... }:
makeInstalledTest {
tested = pkgs.json-glib;
}

42
nixos/tests/systemd-bpf.nix Normal file
View file

@ -0,0 +1,42 @@
import ./make-test-python.nix ({ lib, ... }: {
name = "systemd-bpf";
meta = with lib.maintainers; {
maintainers = [ veehaitch ];
};
nodes = {
node1 = {
virtualisation.vlans = [ 1 ];
networking = {
useNetworkd = true;
useDHCP = false;
firewall.enable = false;
interfaces.eth1.ipv4.addresses = [
{ address = "192.168.1.1"; prefixLength = 24; }
];
};
};
node2 = {
virtualisation.vlans = [ 1 ];
networking = {
useNetworkd = true;
useDHCP = false;
firewall.enable = false;
interfaces.eth1.ipv4.addresses = [
{ address = "192.168.1.2"; prefixLength = 24; }
];
};
};
};
testScript = ''
start_all()
node1.wait_for_unit("systemd-networkd-wait-online.service")
node2.wait_for_unit("systemd-networkd-wait-online.service")
with subtest("test RestrictNetworkInterfaces= works"):
node1.succeed("ping -c 5 192.168.1.2")
node1.succeed("systemd-run -t -p RestrictNetworkInterfaces='eth1' ping -c 5 192.168.1.2")
node1.fail("systemd-run -t -p RestrictNetworkInterfaces='lo' ping -c 5 192.168.1.2")
'';
})

4
pkgs/applications/editors/vim/common.nix
View file

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "9.0.0180";
version = "9.0.0244";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
hash = "sha256-38l97auTi6cue457bfRHme5fvsAmvk1MT2va1E/qguw=";
hash = "sha256-l6fLM6+tc1Wy1mjNPa/s73GKhhGBLz3OXUJgJN1wuxY=";
};
enableParallelBuilding = true;

22
pkgs/applications/networking/sync/rsync/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, perl
, libiconv
, zlib
@ -16,27 +15,18 @@
, xxHash
, enableZstd ? true
, zstd
, enableCopyDevicesPatch ? false
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "rsync";
version = "3.2.4";
version = "3.2.5";
srcs = [
(fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE=";
})
] ++ lib.optional enableCopyDevicesPatch (fetchurl {
src = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
sha256 = "1wj21v57v135n6fnm2m2dxmb9lhrrg62jgkggldp1gb7d6s4arny";
});
patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "sha256-KsTSFjXN95GGe8N3w1ym3af1DZGaWL5FBX/VFgDGmro=";
};
nativeBuildInputs = [ perl ];
@ -64,6 +54,6 @@ stdenv.mkDerivation rec {
homepage = "https://rsync.samba.org/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with lib.maintainers; [ ehmry kampfschlaefer ];
maintainers = with lib.maintainers; [ ehmry kampfschlaefer ivan ];
};
}

2
pkgs/applications/networking/sync/rsync/rrsync.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "rrsync";
inherit (rsync) version srcs;
inherit (rsync) version src;
buildInputs = [
rsync

2
pkgs/applications/radio/tqsl/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
openssl
zlib
db
curl
(curl.override { inherit openssl; })
wxGTK
];

5
pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
View file

@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
"DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl"
];
# https://github.com/AGWA/git-crypt/issues/232
CXXFLAGS = [
"-DOPENSSL_API_COMPAT=0x30000000L"
];
postFixup = ''
wrapProgram $out/bin/git-crypt \
--suffix PATH : ${lib.makeBinPath [ git gnupg ]}

1
pkgs/build-support/go/module.nix
View file

@ -212,6 +212,7 @@ let
flags+=("-v" "-p" "$NIX_BUILD_CORES")
if [ "$cmd" = "test" ]; then
flags+=(-vet=off)
flags+=($checkFlags)
fi

1
pkgs/build-support/go/package.nix
View file

@ -171,6 +171,7 @@ let
flags+=("-v" "-p" "$NIX_BUILD_CORES")
if [ "$cmd" = "test" ]; then
flags+=(-vet=off)
flags+=($checkFlags)
fi

6
pkgs/data/misc/tzdata/default.nix
View file

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "tzdata";
version = "2022b";
version = "2022c";
srcs = [
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
hash = "sha256-9ZDq8Eo5UkVCbCvk+uccFDrqXOvBEIi3oKVwRGHfOX0=";
hash = "sha256-aXT040i/IyMnS1bf+edQAkfjFZ6qS0hd+gzWbnXBS/4=";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
hash = "sha256-urINlD5ZoyGENfSNhopOVS8Y1tfz3RKGYMVmDIC4oF8=";
hash = "sha256-Pnzh82IMwEgZB8fgdNaZEHkyhb/+DKMx7xptGuPqkMw=";
})
];

4
pkgs/development/compilers/dotnet/build-dotnet.nix
View file

@ -15,7 +15,7 @@ assert if type == "sdk" then packages != null else true;
, autoPatchelfHook
, makeWrapper
, libunwind
, openssl
, openssl_1_1
, libuuid
, zlib
, curl
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
icu
libunwind
libuuid
openssl
openssl_1_1
] ++ lib.optional stdenv.isLinux lttng-ust_2_12);
nativeBuildInputs = [

16
pkgs/development/compilers/gcc/10/default.nix
View file

@ -14,7 +14,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@ -29,11 +28,8 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -159,6 +155,9 @@ stdenv.mkDerivation ({
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional langAda gnatboot)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
@ -173,13 +172,10 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -203,7 +199,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib

16
pkgs/development/compilers/gcc/11/default.nix
View file

@ -14,7 +14,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@ -29,11 +28,8 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -167,6 +163,9 @@ stdenv.mkDerivation ({
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional langAda gnatboot)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
@ -181,13 +180,10 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -211,7 +207,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib

16
pkgs/development/compilers/gcc/12/default.nix
View file

@ -14,7 +14,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@ -29,11 +28,8 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -162,6 +158,9 @@ stdenv.mkDerivation ({
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional langAda gnatboot)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
@ -176,13 +175,10 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -206,7 +202,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib

19
pkgs/development/compilers/gcc/4.8/default.nix
View file

@ -13,7 +13,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkg-config ? null
@ -39,11 +38,8 @@ assert langJava -> zip != null && unzip != null
# We enable the isl cloog backend.
assert cloog != null -> isl != null;
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -165,7 +161,11 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkg-config);
++ (optional javaAwtGtk pkg-config)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
depsBuildTarget =
@ -179,16 +179,13 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -210,7 +207,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
cloog
enableLTO

19
pkgs/development/compilers/gcc/4.9/default.nix
View file

@ -13,7 +13,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkg-config ? null
@ -39,11 +38,8 @@ assert langJava -> zip != null && unzip != null
# We enable the isl cloog backend.
assert cloog != null -> isl != null;
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -185,7 +181,11 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkg-config);
++ (optional javaAwtGtk pkg-config)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
depsBuildTarget =
@ -199,16 +199,13 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -230,7 +227,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
cloog
enableLTO

16
pkgs/development/compilers/gcc/6/default.nix
View file

@ -15,7 +15,6 @@
, flex
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, gnatboot ? null
@ -40,11 +39,8 @@ assert langJava -> zip != null && unzip != null
&& zlib != null && boehmgc != null
&& perl != null; # for `--enable-java-home'
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -196,6 +192,9 @@ stdenv.mkDerivation ({
++ (optional javaAwtGtk pkg-config)
++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex)
++ (optional langAda gnatboot)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
@ -210,15 +209,12 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -242,7 +238,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib

19
pkgs/development/compilers/gcc/7/default.nix
View file

@ -12,7 +12,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, enableMultilib ? false
@ -26,11 +25,8 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -164,7 +160,11 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl);
++ (optional (perl != null) perl)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
depsBuildTarget =
@ -178,13 +178,10 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -209,7 +206,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib

19
pkgs/development/compilers/gcc/8/default.nix
View file

@ -12,7 +12,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, enableMultilib ? false
@ -26,11 +25,8 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -148,7 +144,11 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl);
++ (optional (perl != null) perl)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
depsBuildTarget =
@ -162,13 +162,10 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -192,7 +189,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib

16
pkgs/development/compilers/gcc/9/default.nix
View file

@ -14,7 +14,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@ -34,11 +33,8 @@
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
assert stdenv.buildPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
@ -161,6 +157,9 @@ stdenv.mkDerivation ({
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional langAda gnatboot)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional buildPlatform.isDarwin gnused)
;
# For building runtime libs
@ -175,13 +174,10 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
@ -205,7 +201,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib

3
pkgs/development/compilers/gcc/common/configure-flags.nix
View file

@ -4,7 +4,7 @@
, crossStageStatic, libcCross
, version
, gmp, mpfr, libmpc, libelf, isl
, gmp, mpfr, libmpc, isl
, cloog ? null
, enableLTO
@ -110,7 +110,6 @@ let
"--with-mpfr-lib=${mpfr.out}/lib"
"--with-mpc=${libmpc}"
]
++ lib.optional (libelf != null) "--with-libelf=${libelf}"
++ lib.optionals (!crossStageStatic) [
(if libcCross == null
then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include"

4
pkgs/development/compilers/glslang/default.nix
View file

@ -9,13 +9,13 @@
}:
stdenv.mkDerivation rec {
pname = "glslang";
version = "1.3.216.0";
version = "1.3.224.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "sdk-${version}";
hash = "sha256-sjidkiPtRADhyOEKDb2cHCBXnFjLwk2F5Lppv5/fwNQ=";
hash = "sha256-+NKp/4e3iruAcTunpxksvCHxoVYmPd0kFI8JDJJUVg4=";
};
# These get set at all-packages, keep onto them for child drvs

36
pkgs/development/compilers/llvm/10/libcxxabi/default.nix
View file

@ -40,28 +40,20 @@ stdenv.mkDerivation {
"-DLIBCXXABI_ENABLE_SHARED=OFF"
];
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
install -m 644 ../include/cxxabi.h $out/include
'' + lib.optionalString enableShared ''
install -m 644 lib/libc++abi.so.1.0 $out/lib
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

36
pkgs/development/compilers/llvm/11/libcxxabi/default.nix
View file

@ -44,28 +44,20 @@ stdenv.mkDerivation {
"-DLIBCXXABI_ENABLE_SHARED=OFF"
];
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
${stdenv.cc.targetPrefix}install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
install -m 644 ../include/cxxabi.h $out/include
'' + lib.optionalString enableShared ''
install -m 644 lib/libc++abi.so.1.0 $out/lib
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

36
pkgs/development/compilers/llvm/12/libcxxabi/default.nix
View file

@ -42,28 +42,20 @@ stdenv.mkDerivation {
"-DLIBCXXABI_ENABLE_SHARED=OFF"
];
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
${stdenv.cc.targetPrefix}install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
install -m 644 ../include/cxxabi.h $out/include
'' + lib.optionalString enableShared ''
install -m 644 lib/libc++abi.so.1.0 $out/lib
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

36
pkgs/development/compilers/llvm/13/libcxxabi/default.nix
View file

@ -39,28 +39,20 @@ stdenv.mkDerivation rec {
"-DLIBCXXABI_ENABLE_SHARED=OFF"
];
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
install -m 644 ../include/cxxabi.h $out/include
'' + lib.optionalString enableShared ''
install -m 644 lib/libc++abi.so.1.0 $out/lib
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

35
pkgs/development/compilers/llvm/5/libcxxabi/default.nix
View file

@ -25,27 +25,20 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake ];
buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
install -m 644 lib/libc++abi.so.1.0 $out/lib
install -m 644 ../include/cxxabi.h $out/include
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

35
pkgs/development/compilers/llvm/6/libcxxabi/default.nix
View file

@ -25,27 +25,20 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake ];
buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
install -m 644 lib/libc++abi.so.1.0 $out/lib
install -m 644 ../include/cxxabi.h $out/include
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

35
pkgs/development/compilers/llvm/7/libcxxabi/default.nix
View file

@ -44,27 +44,20 @@ stdenv.mkDerivation {
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
${lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"}
install -m 644 ../include/cxxabi.h $out/include
${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"}
${lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"}
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

36
pkgs/development/compilers/llvm/8/libcxxabi/default.nix
View file

@ -40,28 +40,20 @@ stdenv.mkDerivation {
"-DLIBCXXABI_ENABLE_SHARED=OFF"
];
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
install -m 644 ../include/cxxabi.h $out/include
'' + lib.optionalString enableShared ''
install -m 644 lib/libc++abi.so.1.0 $out/lib
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

36
pkgs/development/compilers/llvm/9/libcxxabi/default.nix
View file

@ -40,28 +40,20 @@ stdenv.mkDerivation {
"-DLIBCXXABI_ENABLE_SHARED=OFF"
];
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
install -m 644 ../include/cxxabi.h $out/include
'' + lib.optionalString enableShared ''
install -m 644 lib/libc++abi.so.1.0 $out/lib
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
preInstall = lib.optionalString stdenv.isDarwin ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
'';
postInstall = ''
mkdir -p "$dev/include"
install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"
'';
meta = llvm_meta // {
homepage = "https://libcxxabi.llvm.org/";

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -2380,6 +2380,9 @@ self: super: {
'';
}) super.linear-base;
# https://github.com/peti/hopenssl/issues/5
hopenssl = super.hopenssl.override { openssl = pkgs.openssl_1_1; };
# Fixes compilation with GHC 9.0 and above
# https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3
regex-compat-tdfa = appendPatches [

3
pkgs/development/interpreters/perl/default.nix
View file

@ -39,6 +39,9 @@ let
[
# Do not look in /usr etc. for dependencies.
./no-sys-dirs-5.31.patch
# Enable TLS/SSL verification in HTTP::Tiny by default
./http-tiny-verify-ssl-by-default.patch
]
++ optional stdenv.isSunOS ./ld-shared.patch
++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]

79
pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch Normal file
View file

@ -0,0 +1,79 @@
Patch for HTTP::Tiny that defaults verify_SSL to 1
Based on proposed Debian patch by Dominic Hargreaves:
https://salsa.debian.org/perl-team/interpreter/perl/-/commit/1490431e40e22052f75a0b3449f1f53cbd27ba92
diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
index 5803e4599..88ba51461 100644
--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
+++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
@@ -40,7 +40,7 @@ sub _croak { require Carp; Carp::croak(@_) }
#pod * C<timeout> — Request timeout in seconds (default is 60) If a socket open,
#pod read or write takes longer than the timeout, an exception is thrown.
#pod * C<verify_SSL> — A boolean that indicates whether to validate the SSL
-#pod certificate of an C<https> — connection (default is false)
+#pod certificate of an C<https> — connection (default is true)
#pod * C<SSL_options> — A hashref of C<SSL_*> — options to pass through to
#pod L<IO::Socket::SSL>
#pod
@@ -112,7 +112,7 @@ sub new {
max_redirect => 5,
timeout => defined $args{timeout} ? $args{timeout} : 60,
keep_alive => 1,
- verify_SSL => $args{verify_SSL} || $args{verify_ssl} || 0, # no verification by default
+ verify_SSL => $args{verify_SSL} // $args{verify_ssl} // 1, # verification by default
no_proxy => $ENV{no_proxy},
};
@@ -1038,7 +1038,7 @@ sub new {
timeout => 60,
max_line_size => 16384,
max_header_lines => 64,
- verify_SSL => 0,
+ verify_SSL => 1,
SSL_options => {},
%args
}, $class;
@@ -1765,7 +1765,7 @@ C<timeout> — Request timeout in seconds (default is 60) If a socket open, read
=item *
-C<verify_SSL> — A boolean that indicates whether to validate the SSL certificate of an C<https> — connection (default is false)
+C<verify_SSL> — A boolean that indicates whether to validate the SSL certificate of an C<https> — connection (default is true)
=item *
@@ -2035,7 +2035,7 @@ Verification of server identity
=back
-B<By default, HTTP::Tiny does not verify server identity>.
+B<By default, HTTP::Tiny in NixOS verifies server identity>.
Server identity verification is controversial and potentially tricky because it
depends on a (usually paid) third-party Certificate Authority (CA) trust model
@@ -2043,16 +2043,14 @@ to validate a certificate as legitimate. This discriminates against servers
with self-signed certificates or certificates signed by free, community-driven
CA's such as L<CAcert.org|http://cacert.org>.
-By default, HTTP::Tiny does not make any assumptions about your trust model,
-threat level or risk tolerance. It just aims to give you an encrypted channel
-when you need one.
-
Setting the C<verify_SSL> attribute to a true value will make HTTP::Tiny verify
that an SSL connection has a valid SSL certificate corresponding to the host
name of the connection and that the SSL certificate has been verified by a CA.
Assuming you trust the CA, this will protect against a L<man-in-the-middle
-attack|http://en.wikipedia.org/wiki/Man-in-the-middle_attack>. If you are
-concerned about security, you should enable this option.
+attack|http://en.wikipedia.org/wiki/Man-in-the-middle_attack>.
+
+If you are not concerned about security, and this default in NixOS causes
+problems, you should disable this option.
Certificate verification requires a file containing trusted CA certificates.
--

13
pkgs/development/interpreters/python/cpython/default.nix
View file

@ -7,6 +7,7 @@
, mailcap, mimetypesSupport ? true
, ncurses
, openssl
, openssl_1_1
, readline
, sqlite
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false
@ -75,6 +76,10 @@ assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode))
with lib;
let
# cpython does support/build with openssl 3.0, but some libraries using the ssl module seem to have issues with it
# null check for Minimal
openssl' = if openssl != null then openssl_1_1 else null;
buildPackages = pkgsBuildHost;
inherit (passthru) pythonForBuild;
@ -115,7 +120,7 @@ let
];
buildInputs = filter (p: p != null) ([
zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ]
zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl' ]
++ optionals x11Support [ tcl tk libX11 xorgproto ]
++ optionals (bluezSupport && stdenv.isLinux) [ bluez ]
++ optionals stdenv.isDarwin [ configd ])
@ -321,8 +326,8 @@ in with passthru; stdenv.mkDerivation {
"--with-threads"
] ++ optionals (sqlite != null && isPy3k) [
"--enable-loadable-sqlite-extensions"
] ++ optionals (openssl != null) [
"--with-openssl=${openssl.dev}"
] ++ optionals (openssl' != null) [
"--with-openssl=${openssl'.dev}"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_buggy_getaddrinfo=no"
# Assume little-endian IEEE 754 floating point when cross compiling
@ -484,7 +489,7 @@ in with passthru; stdenv.mkDerivation {
# Enforce that we don't have references to the OpenSSL -dev package, which we
# explicitly specify in our configure flags above.
disallowedReferences =
lib.optionals (openssl != null && !static) [ openssl.dev ]
lib.optionals (openssl' != null && !static) [ openssl'.dev ]
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# Ensure we don't have references to build-time packages.
# These typically end up in shebangs.

8
pkgs/development/interpreters/ruby/default.nix
View file

@ -1,9 +1,10 @@
{ stdenv, buildPackages, lib
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison
, zlib, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison
, autoconf, libiconv, libobjc, libunwind, Foundation
, buildEnv, bundler, bundix
, makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo
, openssl, openssl_1_1
} @ args:
let
@ -26,7 +27,7 @@ let
, useRailsExpress ? true
, rubygemsSupport ? true
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, openssl, openssl_1_1, opensslSupport ? true
, gdbm, gdbmSupport ? true
, ncurses, readline, cursesSupport ? true
, groff, docSupport ? true
@ -75,7 +76,8 @@ let
++ (op fiddleSupport libffi)
++ (ops cursesSupport [ ncurses readline ])
++ (op zlibSupport zlib)
++ (op opensslSupport openssl)
++ (op (lib.versionOlder ver.majMin "3.0" && opensslSupport) openssl_1_1)
++ (op (atLeast30 && opensslSupport) openssl_1_1)
++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml)
# Looks like ruby fails to build on darwin without readline even if curses

4
pkgs/development/libraries/SDL2_ttf/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "SDL2_ttf";
version = "2.0.18";
version = "2.20.1";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
sha256 = "sha256-cjTriINRTgGed0fHA+SndFdbGNQ1wipKKdBoy3aKIlE=";
sha256 = "sha256-eM2tUfPMOtppMrG7bpFLM3mKuXCh6Bd2PyLdv9l9DFc=";
};
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";

2
pkgs/development/libraries/google-cloud-cpp/default.nix
View file

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
abseil-cpp
c-ares
crc32c
curl
(curl.override { inherit openssl; })
grpc
nlohmann_json
openssl

5
pkgs/development/libraries/gpgme/default.nix
View file

@ -110,8 +110,13 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64"
);
# prevent tests from being run during the buildPhase
makeFlags = [ "tests=" ];
doCheck = true;
checkFlags = [ "-C" "tests" ];
passthru.tests = {
python = python3.pkgs.gpgme;
qt = libsForQt5.qgpgme;

19
pkgs/development/libraries/imlib2/default.nix
View file

@ -1,14 +1,16 @@
{ lib, stdenv, fetchurl
# Image file formats
, libjpeg, libtiff, giflib, libpng, libwebp
, libjpeg, libtiff, giflib, libpng, libwebp, libjxl
, libspectre
# imlib2 can load images from ID3 tags.
, libid3tag, librsvg, libheif
, freetype , bzip2, pkg-config
, x11Support ? true, xlibsWrapper ? null
# Compilation error on Darwin with librsvg. For more information see:
# https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613
, svgSupport ? !stdenv.isDarwin
, heifSupport ? !stdenv.isDarwin
, svgSupport ? false
, heifSupport ? false
, webpSupport ? false
, jxlSupport ? false
, psSupport ? false
# for passthru.tests
, libcaca
@ -33,11 +35,14 @@ stdenv.mkDerivation rec {
};
buildInputs = [
libjpeg libtiff giflib libpng libwebp
libjpeg libtiff giflib libpng
bzip2 freetype libid3tag
] ++ optional x11Support xlibsWrapper
++ optional heifSupport libheif
++ optional svgSupport librsvg;
++ optional svgSupport librsvg
++ optional webpSupport libwebp
++ optional jxlSupport libjxl
++ optional psSupport libspectre;
nativeBuildInputs = [ pkg-config ];

3
pkgs/development/libraries/jemalloc/default.nix
View file

@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
"--disable-thp"
"je_cv_thp=no"
]
# AArch64 has configurable page size up to 64k. The default configuration
# for jemalloc only supports 4k page sizes.
++ lib.optional stdenv.isAarch64 "--with-lg-page=16"
;
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds";

15
pkgs/development/libraries/json-glib/default.nix
View file

@ -4,6 +4,7 @@
, glib
, meson
, ninja
, nixosTests
, pkg-config
, gettext
, gobject-introspection
@ -17,13 +18,18 @@ stdenv.mkDerivation rec {
pname = "json-glib";
version = "1.6.6";
outputs = [ "out" "dev" "devdoc" ];
outputs = [ "out" "dev" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4=";
};
patches = [
# Add option for changing installation path of installed tests.
./meson-add-installed-tests-prefix-option.patch
];
strictDeps = true;
depsBuildBuild = [
@ -49,6 +55,9 @@ stdenv.mkDerivation rec {
glib
];
mesonFlags = [
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
# Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
# it should be a build-time dep for build
@ -73,6 +82,10 @@ stdenv.mkDerivation rec {
'';
passthru = {
tests = {
installedTests = nixosTests.installed-tests.json-glib;
};
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";

27
pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch Normal file
View file

@ -0,0 +1,27 @@
diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build
index 1eb56c8..dca444e 100644
--- a/json-glib/tests/meson.build
+++ b/json-glib/tests/meson.build
@@ -21,8 +21,9 @@ test_data = [
'stream-load.json',
]
-installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name)
-installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name)
+installed_test_prefix = get_option('installed_test_prefix')
+installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name)
+installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name)
install_data(test_data, install_dir: installed_test_bindir)
diff --git a/meson_options.txt b/meson_options.txt
index 068a03f..03f398a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,3 +10,6 @@ option('man',
option('tests',
type: 'boolean', value: true,
description: 'Build the tests')
+option('installed_test_prefix',
+ description: 'Prefix for installed tests',
+ type: 'string')

12
pkgs/development/libraries/libewf/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }:
{ fetchurl, fetchpatch, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }:
stdenv.mkDerivation rec {
version = "20201230";
@ -6,9 +6,17 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
sha256 = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc=";
hash = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc=";
};
patches = [
# fix build with OpenSSL 3.0
(fetchpatch {
url = "https://github.com/libyal/libewf/commit/033ea5b4e5f8f1248f74a2ec61fc1be183c6c46b.patch";
hash = "sha256-R4+NO/91kiZP48SJyVF9oYjKCg1h/9Kh8/0VOEmJXPQ=";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib openssl libuuid ]
++ lib.optionals stdenv.isDarwin [ bzip2 ];

4
pkgs/development/libraries/libglvnd/default.nix
View file

@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "libglvnd";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "glvnd";
repo = "libglvnd";
rev = "v${version}";
sha256 = "06y7m486kgg566krbhb0gvmpzy6ayd98psnrmmkrnw8p513lg8k3";
sha256 = "sha256-yXSuG8UwD5KZbn4ysDStTdOGD4uHigjOhazlHT9ndNs=";
};
nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ];

17
pkgs/development/libraries/libs3/default.nix
View file

@ -1,19 +1,26 @@
{ lib, stdenv, fetchFromGitHub, curl, libxml2 }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, curl, libxml2 }:
stdenv.mkDerivation {
pname = "libs3";
version = "unstable-2018-12-03";
version = "unstable-2019-04-10";
src = fetchFromGitHub {
owner = "bji";
repo = "libs3";
rev = "111dc30029f64bbf82031f3e160f253a0a63c119";
sha256 = "1ahf08hc7ql3fazfmlyj9vrhq7cvarsmgn2v8149y63zr1fl61hs";
rev = "287e4bee6fd430ffb52604049de80a27a77ff6b4";
hash = "sha256-xgiY8oJlRMiXB1fw5dhNidfaq18YVwaJ8aErKU11O6U=";
};
patches = [
(fetchpatch { # Fix compilation with openssl 3.0
url = "https://github.com/bji/libs3/pull/112/commits/3c3a1cf915e62b730db854d8007ba835cb38677c.patch";
hash = "sha256-+rWRh8dOznHlamc/T9qbgN0E2Rww3Hn94UeErxNDccs=";
})
];
buildInputs = [ curl libxml2 ];
makeFlags = [ "DESTDIR=$(out)" ];
makeFlags = [ "DESTDIR=${placeholder "out"}" ];
meta = with lib; {
homepage = "https://github.com/bji/libs3";

4
pkgs/development/libraries/libtasn1/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libtasn1";
version = "4.18.0";
version = "4.19.0";
src = fetchurl {
url = "mirror://gnu/libtasn1/libtasn1-${version}.tar.gz";
sha256 = "sha256-Q2XBVJU1Y9ZMZ6AktgfR7nXG23bg0PZXCeqAozTNGJg=";
sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o=";
};
outputs = [ "out" "dev" "devdoc" ];

4
pkgs/development/libraries/liburcu/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
version = "0.13.1";
version = "0.13.2";
pname = "liburcu";
src = fetchurl {
url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
sha256 = "sha256-MhPzPSuPcQ65IOsauyeewEv4rmNh9E8lE8KMINM2MIM=";
sha256 = "sha256-EhP9nxsLdNp94rt0M1t2CY25c4/sXTzcB8DFJPNPwDI=";
};
checkInputs = [ perl ];

4
pkgs/development/libraries/mesa/default.nix
View file

@ -34,7 +34,7 @@ with lib;
let
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
version = "22.1.6";
version = "22.1.7";
branch = versions.major version;
self = stdenv.mkDerivation {
@ -48,7 +48,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 = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a";
sha256 = "da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89";
};
# TODO:

4
pkgs/development/libraries/nettle/default.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl }:
callPackage ./generic.nix rec {
version = "3.8";
version = "3.8.1";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
hash = "sha256-dXbGhIHBmPZEsIwWDRpIULqUSeMIBpRVtSEzGfI06OY=";
hash = "sha256-Nk8+K3fNfc3oP9fEUhnINOVLDHXkKLb4lKI9Et1By/4=";
};
}

11
pkgs/development/libraries/nss/ckpem.patch
View file

@ -1,11 +0,0 @@
--- nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:12.000000000 -0800
+++ nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:20.000000000 -0800
@@ -156,8 +156,6 @@
NSS_EXTERN_DATA pemInternalObject nss_pem_data[];
NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects;
- PRBool logged_in;
-
/* our raw object data array */
NSS_EXTERN_DATA pemInternalObject nss_pem_data[];
NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects;

33
pkgs/development/libraries/nss/generic.nix
View file

@ -19,11 +19,6 @@
}:
let
nssPEM = fetchurl {
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
underscoreVersion = lib.replaceStrings [ "." ] [ "_" ] version;
in
stdenv.mkDerivation rec {
@ -44,23 +39,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ];
prePatch = ''
# strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_
xz -d < ${nssPEM} | sed \
-e 's/-DIRS = builtins $/-DIRS = . builtins/g' \
-e 's/CKO_NETSCAPE_/CKO_NSS_/g' \
-e 's/CKT_NETSCAPE_/CKT_NSS_/g' \
| patch -p1
patchShebangs nss
for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
done
substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
'';
patches = [
# Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
(if (lib.versionOlder version "3.77") then
@ -68,13 +46,20 @@ stdenv.mkDerivation rec {
else
./85_security_load_3.77+.patch
)
./ckpem.patch
./fix-cross-compilation.patch
];
patchFlags = [ "-p0" ];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
postPatch = ''
patchShebangs nss
for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
done
substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
'';

9
pkgs/development/libraries/openssl/default.nix
View file

@ -30,7 +30,7 @@ let
postPatch = ''
patchShebangs Configure
'' + lib.optionalString (lib.versionOlder version "1.1.0") ''
'' + lib.optionalString (lib.versionOlder version "1.1.1") ''
patchShebangs test/*
for a in test/t* ; do
substituteInPlace "$a" \
@ -40,7 +40,7 @@ let
# config is a configure script which is not installed.
+ lib.optionalString (lib.versionAtLeast version "1.1.1") ''
substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
'' + lib.optionalString (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
'' + lib.optionalString (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isMusl) ''
substituteInPlace crypto/async/arch/async_posix.h \
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
'!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
@ -130,11 +130,12 @@ let
] ++ lib.optional enableSSL2 "enable-ssl2"
++ lib.optional enableSSL3 "enable-ssl3"
++ lib.optional (lib.versionAtLeast version "3.0.0") "enable-ktls"
++ lib.optional (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
++ lib.optional (lib.versionAtLeast version "1.1.1" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
# OpenSSL needs a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
# for a comprehensive list of configuration options.
++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared"
++ lib.optional (lib.versionAtLeast version "1.1.1" && static) "no-shared"
++ lib.optional (lib.versionAtLeast version "3.0.0" && static) "no-module"
# This introduces a reference to the CTLOG_FILE which is undesired when
# trying to build binaries statically.
++ lib.optional static "no-ct"

35
pkgs/development/libraries/qca2/default.nix
View file

@ -1,35 +0,0 @@
{ lib, stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }:
stdenv.mkDerivation rec {
pname = "qca";
version = "2.2.1";
src = fetchurl {
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl qt ]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
# tells CMake to use this CA bundle file if it is accessible
preConfigure = ''
export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt
'';
# tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
postPatch = ''
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
'';
meta = with lib; {
description = "Qt Cryptographic Architecture";
license = "LGPL";
homepage = "http://delta.affinix.com/qca";
maintainers = [ maintainers.sander ];
platforms = platforms.unix;
};
}

28
pkgs/development/libraries/qca2/libressl.patch
View file

@ -1,28 +0,0 @@
--- a/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:34:25.810682094 +0000
+++ b/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:29:51.720392423 +0000
@@ -5403,11 +5403,13 @@
ctx = SSL_CTX_new(SSLv2_client_method());
break;
#endif
+#ifndef OPENSSL_NO_SSL3
case TLS::SSL_v3:
ctx = SSL_CTX_new(SSLv3_client_method());
break;
+#endif
case TLS::TLS_v1:
+ ctx = SSL_CTX_new(SSLv23_client_method());
- ctx = SSL_CTX_new(TLSv1_client_method());
break;
case TLS::DTLS_v1:
default:
@@ -7133,8 +7135,10 @@
return new opensslInfoContext(this);
else if ( type == "sha1" )
return new opensslHashContext( EVP_sha1(), this, type);
+#ifndef OPENSSL_NO_SHA0
else if ( type == "sha0" )
return new opensslHashContext( EVP_sha(), this, type);
+#endif
else if ( type == "ripemd160" )
return new opensslHashContext( EVP_ripemd160(), this, type);
#ifdef HAVE_OPENSSL_MD2

13
pkgs/development/libraries/soundtouch/default.nix
View file

@ -1,14 +1,15 @@
{stdenv, lib, fetchFromGitLab, autoconf, automake, libtool}:
{ stdenv, lib, fetchFromGitea, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
pname = "soundtouch";
version = "2.2";
version = "2.3.1";
src = fetchFromGitLab {
owner = pname;
repo = pname;
src = fetchFromGitea {
domain = "codeberg.org";
owner = "soundtouch";
repo = "soundtouch";
rev = version;
sha256 = "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p";
sha256 = "10znckb8mrnmvwj7vq12732al873qhqw27fpb5f8r0bkjdpcj3vr";
};
nativeBuildInputs = [ autoconf automake libtool ];

2
pkgs/development/libraries/spirv-headers/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "spirv-headers";
version = "1.3.216.0";
version = "1.3.224.0";
src = fetchFromGitHub {
owner = "KhronosGroup";

8
pkgs/development/libraries/ti-rpc/default.nix
View file

@ -12,10 +12,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
postPatch = ''
sed '1i#include <stdint.h>' -i src/xdr_sizeof.c
'';
KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config";
nativeBuildInputs = [ autoreconfHook ];
propagatedBuildInputs = [ libkrb5 ];
@ -24,7 +20,9 @@ stdenv.mkDerivation rec {
sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h
'';
preInstall = "mkdir -p $out/etc";
preInstall = ''
mkdir -p $out/etc
'';
doCheck = true;

4
pkgs/development/libraries/vulkan-headers/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "vulkan-headers";
version = "1.3.216.0";
version = "1.3.224.0";
nativeBuildInputs = [ cmake ];
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "sdk-${version}";
hash = "sha256-jHzW3m9smuzEGbZrSyBI74K9rFozxiG3M5Xql/WOw7U=";
hash = "sha256-zUT5+Ttmkrj51a9FS1tQxoYMS0Y0xV8uaCEJNur4khc=";
};
meta = with lib; {

4
pkgs/development/libraries/vulkan-loader/default.nix
View file

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "vulkan-loader";
version = "1.3.216.0";
version = "1.3.224.0";
src = (assert version == vulkan-headers.version;
fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
rev = "sdk-${version}";
hash = "sha256-EcsJzY/R9rreWvYTgoxHNloR5n2xaR/0rouDJVAGaxs=";
hash = "sha256-lmdImPeosHbAbEzPVW4K9Wkz/mF6gr8MVroGf0bDEPc=";
});
patches = [ ./fix-pkgconfig.patch ];

11
pkgs/development/lua-modules/overrides.nix
View file

@ -31,8 +31,8 @@ with prev;
cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: {
externalDeps = [
{ name = "CRYPTO"; dep = pkgs.openssl; }
{ name = "OPENSSL"; dep = pkgs.openssl; }
{ name = "CRYPTO"; dep = pkgs.openssl_1_1; }
{ name = "OPENSSL"; dep = pkgs.openssl_1_1; }
];
disabled = luaOlder "5.1" || luaAtLeast "5.4";
})).overrideAttrs(oa: rec {
@ -271,14 +271,15 @@ with prev;
luaossl = prev.lib.overrideLuarocks prev.luaossl (drv: {
externalDeps = [
{ name = "CRYPTO"; dep = pkgs.openssl; }
{ name = "OPENSSL"; dep = pkgs.openssl; }
# https://github.com/wahern/luaossl/pull/199
{ name = "CRYPTO"; dep = pkgs.openssl_1_1; }
{ name = "OPENSSL"; dep = pkgs.openssl_1_1; }
];
});
luasec = prev.lib.overrideLuarocks prev.luasec (drv: {
externalDeps = [
{ name = "OPENSSL"; dep = pkgs.openssl; }
{ name = "OPENSSL"; dep = pkgs.openssl_1_1; }
];
});

2
pkgs/development/python-modules/cffi/default.nix
View file

@ -11,8 +11,6 @@ if isPyPy then null else buildPythonPackage rec {
sha256 = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk=";
};
outputs = [ "out" "dev" ];
buildInputs = [ libffi ];
nativeBuildInputs = [ pkg-config ];

2
pkgs/development/python-modules/cryptography/default.nix
View file

@ -44,8 +44,6 @@ buildPythonPackage rec {
cargoRoot = "src/rust";
outputs = [ "out" "dev" ];
nativeBuildInputs = lib.optionals (!isPyPy) [
cffi
] ++ [

8
pkgs/development/python-modules/django/3.nix
View file

@ -8,6 +8,7 @@
, asgiref
, pytz
, sqlparse
, tzdata
, pythonOlder
, withGdal ? false
}:
@ -24,7 +25,12 @@ buildPythonPackage rec {
hash = "sha256-9xk0sagi8UqGyayWNAU2iSec0ErmnLat5KWUcbiGWCs=";
};
patches = lib.optional withGdal
patches = [
(substituteAll {
src = ./django_3_set_zoneinfo_dir.patch;
zoneinfo = tzdata + "/share/zoneinfo";
})
] ++ lib.optional withGdal
(substituteAll {
src = ./django_3_set_geos_gdal_lib.patch;
inherit geos39;

13
pkgs/development/python-modules/django/django_3_set_zoneinfo_dir.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 28302440c7..278cfa5e62 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -200,7 +200,7 @@ class Settings:
if hasattr(time, 'tzset') and self.TIME_ZONE:
# When we can, attempt to validate the timezone. If we can't find
# this file, no check happens and it's harmless.
- zoneinfo_root = Path('/usr/share/zoneinfo')
+ zoneinfo_root = Path('@zoneinfo@')
zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split('/'))
if zoneinfo_root.exists() and not zone_info_file.exists():
raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)

4
pkgs/development/python-modules/flask/default.nix
View file

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "flask";
version = "2.1.3";
version = "2.2.2";
src = fetchPypi {
pname = "Flask";
inherit version;
sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
sha256 = "sha256-ZCxFDRnErUgvlnKb0qj20yVUqh4jH09rTn5SZLFsyis=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/hatchling/default.nix
View file

@ -20,7 +20,7 @@
let
pname = "hatchling";
version = "1.6.0";
version = "1.8.0";
in
buildPythonPackage {
inherit pname version;
@ -28,7 +28,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vW6FBd5RGsQhf/UJJ/bRhFSUYI5AHmOmK4MMMfthNUQ=";
sha256 = "sha256-pPmC/coHF9jEa/57UBMC+QqvKlMChF1VC0nIc5aB/rI=";
};
# listed in backend/src/hatchling/ouroboros.py

8
pkgs/development/python-modules/jsonschema/default.nix
View file

@ -14,16 +14,20 @@
buildPythonPackage rec {
pname = "jsonschema";
version = "4.9.1";
version = "4.13.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QIxMjtDe3jsmj3pEF4T3QgY4CwT5PrLVN8e++z3zCZ8=";
sha256 = "sha256-N3ZRLfT1P3Tm4o/jVxe1siPBdWh1SGmEoxvJFl5/ySA=";
};
patches = [
./remove-fancy-pypi-readme.patch
];
postPatch = ''
patchShebangs json/bin/jsonschema_suite
'';

33
pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch Normal file
View file

@ -0,0 +1,33 @@
--- a/pyproject.toml 2022-08-21 05:04:18.443484836 +0200
+++ b/pyproject.toml 2022-08-21 05:04:50.789353514 +0200
@@ -76,30 +76,6 @@
Changelog = "https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst"
Source = "https://github.com/python-jsonschema/jsonschema"
-[tool.hatch.metadata.hooks.fancy-pypi-readme]
-content-type = "text/x-rst"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "README.rst"
-end-before = ".. start cut from PyPI"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "README.rst"
-start-after = ".. end cut from PyPI\n\n\n"
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-text = """
-
-
-Release Information
--------------------
-
-"""
-
-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
-path = "CHANGELOG.rst"
-pattern = "(^v.+?)\nv"
-
[tool.isort]
from_first = true
include_trailing_comma = true

6
pkgs/development/python-modules/markdown/default.nix
View file

@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "markdown";
version = "3.3.7";
version = "3.4.1";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
format = "setuptools";
src = fetchPypi {
pname = "Markdown";
inherit version;
sha256 = "cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874";
sha256 = "3b809086bb6efad416156e00a0da66fe47618a5d6918dd688f53f40c8e4cfeff";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [

4
pkgs/development/python-modules/pygments/default.nix
View file

@ -10,12 +10,12 @@
let pygments = buildPythonPackage
rec {
pname = "pygments";
version = "2.12.0";
version = "2.13.0";
src = fetchPypi {
pname = "Pygments";
inherit version;
sha256 = "sha256-XrEWEY+WEv8e6JrJZDe7a0no8E2KE7UUuib2ICCOJus=";
sha256 = "sha256-VqhQiulfmOK5vfk6a+WuP32K+Fi0PgLFov8INya+QME=";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/pytest-aiohttp/default.nix
View file

@ -14,6 +14,8 @@ buildPythonPackage rec {
format = "setuptools";
__darwinAllowLocalNetworking = true;
src = fetchPypi {
inherit pname version;
sha256 = "39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4";

2
pkgs/development/python-modules/python-socks/default.nix
View file

@ -19,6 +19,8 @@ buildPythonPackage rec {
disabled = pythonOlder "3.6.1";
__darwinAllowLocalNetworking = true;
src = fetchFromGitHub {
owner = "romis2012";
repo = pname;

2
pkgs/development/python-modules/requests/default.nix
View file

@ -20,6 +20,8 @@ buildPythonPackage rec {
version = "2.28.1";
disabled = pythonOlder "3.7";
__darwinAllowLocalNetworking = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-fFWZsQL+3apmHIJsVqtP7ii/0X9avKHrvj5/GdfJeYM=";

2
pkgs/development/python-modules/responses/default.nix
View file

@ -15,6 +15,8 @@ buildPythonPackage rec {
disabled = pythonOlder "3.7";
__darwinAllowLocalNetworking = true;
src = fetchFromGitHub {
owner = "getsentry";
repo = pname;

4
pkgs/development/python-modules/setuptools-rust/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "setuptools-rust";
version = "1.5.0";
version = "1.5.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-C4rrgUr+Dp18MVaewJNtH1IBmTUwY5JE+pc+F0IAVnE=";
sha256 = "sha256-DgXkVmRdWUKcsQITcK7ec8B2DpNgu/2q77W87VMOudc=";
};
nativeBuildInputs = [ setuptools-scm ];

2
pkgs/development/python-modules/twisted/default.nix
View file

@ -56,6 +56,8 @@ buildPythonPackage rec {
sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA=";
};
__darwinAllowLocalNetworking = true;
propagatedBuildInputs = [
attrs
automat

9
pkgs/development/python-modules/werkzeug/default.nix
View file

@ -9,11 +9,12 @@
, pytest-timeout
, pytest-xprocess
, pytestCheckHook
, markupsafe
}:
buildPythonPackage rec {
pname = "werkzeug";
version = "2.1.2";
version = "2.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,10 +22,12 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Werkzeug";
inherit version;
sha256 = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY=";
sha256 = "sha256-fqLUgyLMfA+LOiFe1z6r17XXXQtQ4xqwBihsz/ngC48=";
};
propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [
propagatedBuildInputs = [
markupsafe
] ++ lib.optionals (!stdenv.isDarwin) [
# watchdog requires macos-sdk 10.13+
watchdog
] ++ lib.optionals (pythonOlder "3.7") [

5
pkgs/development/ruby-modules/gem-config/default.nix
View file

@ -20,7 +20,7 @@
{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem
, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
, cmake, libssh2, openssl, libmysqlclient, git, perl, pcre, gecode_3, curl
, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, gecode_3, curl
, msgpack, 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, linux-pam, libidn, protobuf, fribidi, harfbuzz
@ -478,7 +478,8 @@ in
};
openssl = attrs: {
buildInputs = [ openssl ];
# https://github.com/ruby/openssl/issues/369
buildInputs = [ openssl_1_1 ];
};
opus-ruby = attrs: {

6
pkgs/development/tools/build-managers/cmake/001-search-path.diff
View file

@ -12,7 +12,7 @@ index b9381c3d7d..5e944640b5 100644
# CMake install location
"${_CMAKE_INSTALL_DIR}"
)
@@ -47,48 +44,46 @@ endif()
@@ -47,48 +44,48 @@ endif()
# Non "standard" but common install prefixes
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
@ -22,7 +22,9 @@ index b9381c3d7d..5e944640b5 100644
)
# List common include file locations not under the common prefixes.
+if(IS_DIRECTORY $ENV{NIX_CC})
+if(IS_DIRECTORY $ENV{NIX_CC}
+ AND EXISTS $ENV{NIX_CC}/nix-support/orig-libc
+ AND EXISTS $ENV{NIX_CC}/nix-support/orig-libc-dev)
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc" _nix_cmake_libc)
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev)
+else()

4
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
+ lib.optionalString isBootstrap "-boot"
+ lib.optionalString cursesUI "-cursesUI"
+ lib.optionalString qt5UI "-qt5UI";
version = "3.24.0";
version = "3.24.1";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
sha256 = "sha256-wrYffN7LFXbK0l+Rio9CuGhdiKgy/UtiueD6MukVplg=";
sha256 = "sha256-STHid6TbGoBfE7qnATp3V6DL/lt5MogpJccGHZ0fqCs=";
};
patches = [

4
pkgs/development/tools/build-managers/waf/default.nix
View file

@ -8,13 +8,13 @@ let
in
stdenv.mkDerivation rec {
pname = "waf";
version = "2.0.23";
version = "2.0.24";
src = fetchFromGitLab {
owner = "ita1024";
repo = "waf";
rev = "${pname}-${version}";
sha256 = "sha256-AASjkXb3eCVjbuT0GOwhagoNHxG7/XP1Mj0i1U4j13Q=";
sha256 = "sha256-nunPDYAy0yfDJpsc+E8SyyFLny19wwrVzxeUOhh7nc4=";
};
nativeBuildInputs = [ python3 ensureNewerSourcesForZipFilesHook ];

3
pkgs/development/tools/misc/libtool/libtool2.nix
View file

@ -38,10 +38,9 @@ stdenv.mkDerivation rec {
# libtool commit da2e352735722917bf0786284411262195a6a3f6 changed
# the shebang from `/bin/sh` (which is a special sandbox exception)
# to `/usr/bin/env sh`, meaning that we now need to patch shebangs
# in libtoolize and ltmain.sh since `dontPatchShebangs` is set:
# in libtoolize.in:
''
substituteInPlace libtoolize.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}'
substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}'
'';
strictDeps = true;

3
pkgs/development/tools/rust/rustup/default.nix
View file

@ -6,6 +6,7 @@
, rustPlatform
, makeWrapper
, pkg-config
, openssl
, curl
, zlib
, Security
@ -36,7 +37,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [
curl
(curl.override { inherit openssl; })
zlib
] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ];

4
pkgs/development/tools/spirv-tools/default.nix
View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "spirv-tools";
version = "1.3.216.0";
version = "1.3.224.0";
src = (assert version == spirv-headers.version;
fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "sdk-${version}";
hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0=";
hash = "sha256-jpVvjrNrTAKUY4sjUT/gCUElLtW4BrznH1DbStojGB8=";
}
);

4
pkgs/development/tools/vulkan-validation-layers/default.nix
View file

@ -22,7 +22,7 @@ let
in
stdenv.mkDerivation rec {
pname = "vulkan-validation-layers";
version = "1.3.216.0";
version = "1.3.224.0";
# If we were to use "dev" here instead of headers, the setupHook would be
# placed in that output instead of "out".
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "sdk-${version}";
hash = "sha256-ri6ImAuskbvYL/ZM8kaVDZRP2v1qfSaafVacwwRF424=";
hash = "sha256-MmAxUuV9CVJ6LHUb6ePEiE37meDB1TqPAwLsPdHQ1u8=";
});
# Include absolute paths to layer libraries in their associated

3
pkgs/development/web/nodejs/v14.nix
View file

@ -1,7 +1,8 @@
{ callPackage, python3, lib, stdenv, enableNpm ? true }:
{ callPackage, python3, lib, stdenv, openssl, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
inherit openssl;
python = python3;
};
in

16
pkgs/os-specific/linux/bluez/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, alsa-lib
, dbus
, ell
@ -23,11 +22,11 @@
];
in stdenv.mkDerivation rec {
pname = "bluez";
version = "5.64";
version = "5.65";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
sha256 = "sha256-rkN+ZbazBwwZi8WwEJ/pzeueqjhzgOIHL53mX+ih3jQ=";
sha256 = "sha256-JWWk1INUtXbmrZLiW1TtZoCCllgciruAWHBR+Zk9ltQ=";
};
buildInputs = [
@ -50,17 +49,6 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" "test" ];
patches = [
# https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5
# which fixes https://github.com/bluez/bluez/issues/329
# and is already merged upstream and not yet in a release.
(fetchpatch {
name = "StateDirectory_and_ConfigurationDirectory.patch";
url = "https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5.patch";
sha256 = "sha256-MI6yPTiDLHsSTjLvNqtWnuy2xUMYpSat1WhMbeoedSM=";
})
];
postPatch = ''
substituteInPlace tools/hid2hci.rules \
--replace /sbin/udevadm ${systemdMinimal}/bin/udevadm \

4
pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub
, cmake
, nasm
, openssl
, openssl_1_1
, python3
, extraCmakeFlags ? [ ]
}:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
nasm
openssl
openssl_1_1
python3
];
}

6
pkgs/os-specific/linux/systemd/default.nix
View file

@ -83,7 +83,7 @@
, withHostnamed ? true
, withHwdb ? true
, withImportd ? !stdenv.hostPlatform.isMusl
, withLibBPF ? false # currently fails while generating BPF objects
, withLibBPF ? true
, withLocaled ? true
, withLogind ? true
, withMachined ? true
@ -207,6 +207,10 @@ stdenv.mkDerivation {
--replace \
"run_command(cc.cmd_array(), '-print-prog-name=objcopy', check: true).stdout().strip()" \
"'${stdenv.cc.bintools.targetPrefix}objcopy'"
'' + lib.optionalString withLibBPF ''
# BPF does not work with stack protector
substituteInPlace src/core/bpf/meson.build \
--replace "clang_flags = [" "clang_flags = [ '-fno-stack-protector',"
'' + (
let
# The following patches references to dynamic libraries to ensure that

4
pkgs/os-specific/linux/util-linux/default.nix
View file

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
version = "2.38";
version = "2.38.1";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
hash = "sha256-bREcvk1VszbbLx++/7xluJkIcEwBE2Nx0yqpvsNz62Q=";
hash = "sha256-YEkqGbRObPmj3f9oMlszO4tStsWc4+vWoOyqTFEX6E8=";
};
patches = [

4
pkgs/os-specific/windows/mingw-w64/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, windows, fetchurl }:
let
version = "9.0.0";
version = "10.0.0";
in stdenv.mkDerivation {
pname = "mingw-w64";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r";
hash = "sha256-umtDCu1yxjo3aFMfaj/8Kw/eLFejslFFDc9ImolPCJQ=";
};
outputs = [ "out" "dev" ];

4
pkgs/servers/misc/oven-media-engine/default.nix
View file

@ -5,7 +5,7 @@
, bc
, pkg-config
, perl
, openssl_3
, openssl
, zlib
, ffmpeg
, libvpx
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ bc pkg-config perl ];
buildInputs = [ openssl_3 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ];
buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ];
preBuild = ''
patchShebangs core/colorg++

9
pkgs/servers/sql/mariadb/default.nix
View file

@ -2,7 +2,7 @@
# Native buildInputs components
, bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config
# Common components
, curl, libiconv, ncurses, openssl, pcre, pcre2
, curl, libiconv, ncurses, openssl, openssl_1_1, pcre, pcre2
, libkrb5, libaio, liburing, systemd
, CoreServices, cctools, perl
, jemalloc, less, libedit
@ -39,13 +39,16 @@ commonOptions = packageSettings: rec { # attributes common to both builds
++ lib.optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
buildInputs = [
curl libiconv ncurses openssl zlib
libiconv ncurses zlib
] ++ (packageSettings.extraBuildInputs or [])
++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ]
++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ]))
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]
++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]);
++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ])
++ (if (lib.versionOlder version "10.8")
then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ]
else [ openssl curl ]);
prePatch = ''
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt

2
pkgs/servers/sql/mysql/8.0.x.nix
View file

@ -23,7 +23,7 @@ self = stdenv.mkDerivation rec {
'';
buildInputs = [
boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
zstd libfido2
] ++ lib.optionals stdenv.isLinux [
numactl libtirpc

6
pkgs/servers/sql/proxysql/default.nix
View file

@ -20,7 +20,7 @@
, libuuid
, lz4
, nlohmann_json
, openssl_3
, openssl
, pcre
, perl
, python2
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bison
(curl.override { openssl = openssl_3; })
curl
flex
gnutls
libgcrypt
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
{ f = "libev"; p = libev; }
{ f = "libinjection"; p = libinjection; }
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_70; }
{ f = "libssl"; p = openssl_3; }
{ f = "libssl"; p = openssl; }
{ f = "lz4"; p = lz4; }
{ f = "pcre"; p = pcre; }
{ f = "re2"; p = re2; }

Some files were not shown because too many files have changed in this diff Show more