Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-09-08 06:00:58 +00:00 committed by GitHub
commit d987b47512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 625 additions and 304 deletions

@ -1,6 +1,6 @@
{ lib, trivialBuild, fetchurl }:
{ lib, melpaBuild, fetchurl, writeText }:
trivialBuild rec {
melpaBuild rec {
pname = "ebuild-mode";
version = "1.65";
@ -9,6 +9,14 @@ trivialBuild rec {
sha256 = "sha256-vJ+UlPMIuZ02da9R67wIq2dVaWElu/sYmWx2KgBQ9B8=";
};
commit = "not-used-but-has-to-be-set";
recipe = writeText "recipe" ''
(ebuild-mode
:url "https://anongit.gentoo.org/git/proj/ebuild-mode.git"
:fetcher git)
'';
meta = with lib; {
description = "Major modes for Gentoo package files";
license = licenses.gpl2Plus;

@ -1,5 +1,6 @@
{
mkDerivation, lib,
wrapGAppsHook,
extra-cmake-modules, kdoctools,
kio, libksane
}:
@ -13,6 +14,6 @@ mkDerivation {
maintainers = with maintainers; [ polendri ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ wrapGAppsHook extra-cmake-modules kdoctools ];
buildInputs = [ kio libksane ];
}

@ -2,6 +2,7 @@
, libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake
, wrapQtAppsHook
, wrapGAppsHook
, withCC ? true, opencc
, withEpwing ? true, libeb
, withExtraTiff ? true, libtiff
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
--replace "opencc.2" "opencc"
'';
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook wrapGAppsHook ];
buildInputs = [
qtbase qtsvg qtwebkit qttools
libvorbis hunspell xz lzo

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "iptsd";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
hash = "sha256-06KGMXkp5lR05iNQOll1h0q+Z+XWMberqG1C9Cs7VfA=";
hash = "sha256-iVxxlblwrZ4SPbVR0kIG+ePExk4qT6gExgvHS1Ksp6A=";
};
nativeBuildInputs = [

@ -33,16 +33,16 @@ let
in
buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.40.1";
version = "1.40.2";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-UmRI1aYPAz8I6Th+L5N1YXbvaIOS6m2jEKFl6MdCUVA=";
rev = "v${version}-fixed-tag";
hash = "sha256-3apr4dCnw+eIJ7PkpQtpgGYWl1jPLV/z/aRuBVbFdHk=";
};
npmDepsHash = "sha256-zk7Zc/I8uK8CXo0nHMg1CPG28OHRoL1fh1MLOsIr3ao=";
npmDepsHash = "sha256-qOABH0rAQyioYOSEjyJtVoqMmaxFXfXXT1MRDjuo1rI=";
nativeBuildInputs = [
makeWrapper

@ -1,5 +1,5 @@
{ lib, stdenv, llvm_meta
, monorepoSrc, runCommand
, monorepoSrc, runCommand, fetchpatch
, cmake, ninja, python3, fixDarwinDylibNames, version
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
, libcxxabi, libcxxrt, libunwind
@ -47,6 +47,15 @@ stdenv.mkDerivation rec {
patches = [
./gnu-install-dirs.patch
# See:
# - https://reviews.llvm.org/D133566
# - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432
# !!! Drop in LLVM 16+
(fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";
hash = "sha256-AaM9A6tQ4YAw7uDqCIV4VaiUyLZv+unwcOqbakwW9/k=";
relative = "libcxx";
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch
{ lib, stdenv, fetchurl, fetchpatch, fetchgit
, bzip2
, expat
, libffi
@ -18,6 +18,7 @@
, self
, configd
, darwin
, windows
, autoreconfHook
, autoconf-archive
, pkg-config
@ -44,6 +45,9 @@
, static ? stdenv.hostPlatform.isStatic
, enableFramework ? false
, enableOptimizations ? false
# these dont build for windows
, withGdbm ? !stdenv.hostPlatform.isWindows
, withReadline ? !stdenv.hostPlatform.isWindows
# enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility.
# clang starts supporting `-fno-sematic-interposition` with version 10
, enableNoSemanticInterposition ? (!stdenv.cc.isClang || (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "10"))
@ -128,12 +132,17 @@ let
];
buildInputs = filter (p: p != null) ([
zlib bzip2 expat xz libffi libxcrypt gdbm sqlite readline ncurses openssl' ]
zlib bzip2 expat xz libffi libxcrypt ]
++ optional withGdbm gdbm
++ [ sqlite ]
++ optional withReadline readline
++ [ ncurses openssl' ]
++ optionals x11Support [ tcl tk libX11 xorgproto ]
++ optionals (bluezSupport && stdenv.isLinux) [ bluez ]
++ optionals stdenv.isDarwin [ configd ])
++ optionals enableFramework [ Cocoa ]
++ optionals stdenv.hostPlatform.isMinGW [ windows.mingw_w64_pthreads windows.dlfcn ]
++ optionals tzdataSupport [ tzdata ]; # `zoneinfo` module
hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
@ -160,6 +169,8 @@ let
# are not documented, and must be derived from the configure script (see links
# below).
sysconfigdataHook = with stdenv.hostPlatform; with passthru; let
machdep = if isWindows then "win32" else parsed.kernel.name; # win32 is added by Fedoras patch
# https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428
# The configure script uses "arm" as the CPU name for all 32-bit ARM
# variants when cross-compiling, but native builds include the version
@ -176,7 +187,7 @@ let
powerpc64 = "ppc64";
powerpc64le = "ppc64le";
}.${parsed.cpu.name} or parsed.cpu.name;
in "${parsed.kernel.name}-${cpu}";
in "${machdep}-${cpu}";
# https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724
multiarchCpu =
@ -205,12 +216,13 @@ let
else "gnu";
multiarch =
if isDarwin then "darwin"
else "${multiarchCpu}-${parsed.kernel.name}-${pythonAbiName}";
else if isWindows then ""
else "${multiarchCpu}-${machdep}-${pythonAbiName}";
abiFlags = optionalString isPy37 "m";
# https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78
pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${parsed.kernel.name}_${multiarch}";
pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${machdep}_${multiarch}";
in ''
sysconfigdataHook() {
if [ "$1" = '${placeholder "out"}' ]; then
@ -222,12 +234,13 @@ let
addEnvHooks "$hostOffset" sysconfigdataHook
'';
execSuffix = stdenv.hostPlatform.extensions.executable;
in with passthru; stdenv.mkDerivation {
pname = "python3";
inherit src version;
inherit nativeBuildInputs;
buildInputs = [ bash ] ++ buildInputs; # bash is only for patchShebangs
buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ bash ] ++ buildInputs; # bash is only used for patchShebangs
prePatch = optionalString stdenv.isDarwin ''
@ -295,9 +308,19 @@ in with passthru; stdenv.mkDerivation {
] ++ optionals stdenv.hostPlatform.isLoongArch64 [
# https://github.com/python/cpython/issues/90656
./loongarch-support.patch
];
] ++ optionals (stdenv.hostPlatform.isMinGW) (let
# https://src.fedoraproject.org/rpms/mingw-python3
mingw-patch = fetchgit {
name = "mingw-python-patches";
url = "https://src.fedoraproject.org/rpms/mingw-python3.git";
rev = "45c45833ab9e5480ad0ae00778a05ebf35812ed4"; # for python 3.11.5 at the time of writing.
sha256 = "sha256-KIyNvO6MlYTrmSy9V/DbzXm5OsIuyT/BEpuo7Umm9DI=";
};
in [
"${mingw-patch}/*.patch"
]);
postPatch = ''
postPatch = optionalString (!stdenv.hostPlatform.isWindows) ''
substituteInPlace Lib/subprocess.py \
--replace "'/bin/sh'" "'${bash}/bin/sh'"
'' + optionalString mimetypesSupport ''
@ -360,8 +383,9 @@ in with passthru; stdenv.mkDerivation {
"ac_cv_have_long_long_format=yes"
"ac_cv_have_size_t_format=yes"
"ac_cv_computed_gotos=yes"
"ac_cv_file__dev_ptmx=yes"
"ac_cv_file__dev_ptc=yes"
# Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always.
"ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
"ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
"--with-build-python=${pythonForBuildInterpreter}"
] ++ optionals stdenv.hostPlatform.isLinux [
@ -370,7 +394,8 @@ in with passthru; stdenv.mkDerivation {
"ac_cv_func_lchmod=no"
] ++ optionals tzdataSupport [
"--with-tzpath=${tzdata}/share/zoneinfo"
] ++ optional static "LDFLAGS=-static";
] ++ optional static "LDFLAGS=-static"
++ optional (execSuffix != "") "--with-suffix=${execSuffix}";
preConfigure = optionalString (pythonOlder "3.12") ''
for i in /usr /sw /opt /pkg; do # improve purity
@ -436,7 +461,7 @@ in with passthru; stdenv.mkDerivation {
# Use Python3 as default python
ln -s "$out/bin/idle3" "$out/bin/idle"
ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
ln -s "$out/bin/python3" "$out/bin/python"
ln -s "$out/bin/python3${execSuffix}" "$out/bin/python${execSuffix}"
ln -s "$out/bin/python3-config" "$out/bin/python-config"
ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
ln -sL "$out/share/man/man1/python3.1.gz" "$out/share/man/man1/python.1.gz"
@ -505,6 +530,14 @@ in with passthru; stdenv.mkDerivation {
To use Python with Nix and nixpkgs, have a look at the online documentation:
<https://nixos.org/manual/nixpkgs/stable/#python>.
EXTERNALLY_MANAGED
'' + optionalString stdenv.hostPlatform.isWindows ''
# Shebang files that link against the build python. Shebang dont work on windows
rm $out/bin/2to3*
rm $out/bin/idle*
rm $out/bin/pydoc*
echo linking DLLs for pythons compiled librairies
linkDLLsInfolder $out/lib/python*/lib-dynload/
'';
preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
@ -574,7 +607,7 @@ in with passthru; stdenv.mkDerivation {
high level dynamic data types.
'';
license = licenses.psfl;
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
maintainers = with maintainers; [ fridh ];
mainProgram = executable;
};

@ -1103,7 +1103,7 @@ dependencies = [
[[package]]
name = "deltachat"
version = "1.120.0"
version = "1.121.0"
dependencies = [
"ansi_term",
"anyhow",
@ -1179,7 +1179,7 @@ dependencies = [
[[package]]
name = "deltachat-jsonrpc"
version = "1.120.0"
version = "1.121.0"
dependencies = [
"anyhow",
"async-channel",
@ -1203,7 +1203,7 @@ dependencies = [
[[package]]
name = "deltachat-repl"
version = "1.120.0"
version = "1.121.0"
dependencies = [
"ansi_term",
"anyhow",
@ -1218,7 +1218,7 @@ dependencies = [
[[package]]
name = "deltachat-rpc-server"
version = "1.120.0"
version = "1.121.0"
dependencies = [
"anyhow",
"deltachat",
@ -1243,7 +1243,7 @@ dependencies = [
[[package]]
name = "deltachat_ffi"
version = "1.120.0"
version = "1.121.0"
dependencies = [
"anyhow",
"deltachat",

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.120.0";
version = "1.121.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-q2Va0NbWwte8wZQWhXiORlYGoFDvuWmQShSRtlwbA6Y=";
hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA=";
};
patches = [

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.36.2";
version = "0.36.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
hash = "sha256-UmyKX9vgIcOwJGNPadXwbwry6oJ56SPpDQnQHlqCLag=";
hash = "sha256-5s2I24gvHRXHm7ZTNZxc6ge9Kbe6UObcY29SvbIUWJg=";
};
propagatedBuildInputs = [

@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, django-stubs
, fetchFromGitHub
, mypy
, py
, pytest-mypy-plugins
, pytestCheckHook
, pythonOlder
, requests
, types-pyyaml
, types-requests
, typing-extensions
}:
buildPythonPackage rec {
pname = "djangorestframework-stubs";
version = "3.14.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "typeddjango";
repo = "djangorestframework-stubs";
rev = version;
hash = "sha256-T357ocJvDC+vt0I4VyAu0Q9YzY9cSK7shgp9fQ1qHyY=";
};
propagatedBuildInputs = [
django-stubs
mypy
requests
types-pyyaml
types-requests
typing-extensions
];
nativeCheckInputs = [
mypy
py
pytest-mypy-plugins
pytestCheckHook
];
meta = with lib; {
description = "PEP-484 stubs for Django REST Framework";
homepage = "https://github.com/typeddjango/djangorestframework-stubs";
changelog = "https://github.com/typeddjango/djangorestframework-stubs/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ elohmeier ];
};
}

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "gspread";
version = "5.11.0";
version = "5.11.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "burnash";
repo = "gspread";
rev = "refs/tags/v${version}";
hash = "sha256-FgAdsHj6Iv08cl5GwdKyGgjVN3pylZUu/plRq/DxVbE=";
hash = "sha256-a8A47il9NrMdHkSX4YmQj4VIAYDXK5V+FUdwv+LGIfQ=";
};
nativeBuildInputs = [

@ -4,7 +4,6 @@
, pythonOlder
, filelock
, fsspec
, importlib-metadata
, packaging
, pyyaml
, requests
@ -14,16 +13,16 @@
buildPythonPackage rec {
pname = "huggingface-hub";
version = "0.15.1";
version = "0.16.4";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "huggingface";
repo = "huggingface_hub";
rev = "refs/tags/v${version}";
hash = "sha256-q30/oNP1NjyxiJuSfxyjFgciydImMUgPdGJ/tqVtwZk=";
hash = "sha256-fWvEvYiaLiVGmDdfibIHJAsu7nUX+eaE0QGolS3LHO8=";
};
propagatedBuildInputs = [
@ -34,8 +33,6 @@ buildPythonPackage rec {
requests
tqdm
typing-extensions
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
# Tests require network access.
@ -45,7 +42,7 @@ buildPythonPackage rec {
"huggingface_hub"
];
meta = with lib; {
meta = with lib; {
description = "Download and publish models and other files on the huggingface.co hub";
homepage = "https://github.com/huggingface/huggingface_hub";
changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}";

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvista";
version = "0.42.0";
version = "0.42.1";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-ujuDH+GK9Q6V8r/PgU5Lu3P7cmau/n7Rk/8a+v7/JRo=";
hash = "sha256-Bk2bw6WCLzMb3nLMCS9rRugNocA9eYju/aoE68TYu5c=";
};
propagatedBuildInputs = [

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "seatconnect";
version = "1.1.7";
version = "1.1.9";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "farfar";
repo = pname;
rev = version;
hash = "sha256-8QZtivHG+tf7S2hVlFaQ7yCeCCI7ft/EIr0D73mcURw=";
rev = "refs/tags/${version}";
hash = "sha256-HITVrI0o94a61gy/TYSGFtLBYX4Rw/dK1o2/KsvHLTQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "ypy-websocket";
version = "0.12.1";
version = "0.12.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "y-crdt";
repo = "ypy-websocket";
rev = "refs/tags/v${version}";
hash = "sha256-JsSOh7CSHUnGJmNAP87fMMsRgdj6nNna1XVe15MYqoA=";
hash = "sha256-3ANuIwRxUoFo5SSdTvBhTHExrYR7timu7XkE0t+UyWk=";
};
pythonRelaxDeps = [

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "pyenv";
version = "2.3.25";
version = "2.3.26";
src = fetchFromGitHub {
owner = "pyenv";
repo = "pyenv";
rev = "refs/tags/v${version}";
hash = "sha256-804bLieYrfwzUrKSvZtC6Td4+fFPw1WrhV1NE4n49Rw=";
hash = "sha256-3pLH8/k+9T8lDBw/qd9WcYE4o3SwG/WXGWR0sLGUWLE=";
};
postPatch = ''

@ -4,6 +4,7 @@
, fetchFromGitHub
, installShellFiles
, pkg-config
, openssl
, libiconv
, testers
, sqlx-cli
@ -26,19 +27,23 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-X7fLbih1s3sxn8vb2kQeFUKDK2DlC+sjm9ZTwj3FD1Y=";
doCheck = false;
cargoBuildFlags = [ "--package sqlx-cli --no-default-features --features rustls,postgres,sqlite,mysql,completions" ];
cargoBuildFlags = [ "--package sqlx-cli --no-default-features --features native-tls,postgres,sqlite,mysql,completions" ];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = lib.optionals stdenv.isDarwin [
CoreFoundation
Security
SystemConfiguration
libiconv
];
buildInputs =
lib.optionals stdenv.isLinux [
openssl
] ++
lib.optionals stdenv.isDarwin [
CoreFoundation
Security
SystemConfiguration
libiconv
];
postInstall = ''
for shell in bash fish zsh; do

@ -8,12 +8,12 @@ buildGoModule rec {
owner = "mhansen";
repo = "rtl_433_prometheus";
rev = "v${version}";
sha256 = "1998gvfa5310bxhi6kfv8bn99369dxph3pwrpp335997b25lc2w2";
hash = "sha256-ggtGi1gnpTLGvZnfAW9vyYyU7ELbTRNhXyCMotx+KKU=";
};
postPatch = "substituteInPlace rtl_433_prometheus.go --replace /bin/bash ${bash}/bin/bash";
vendorSha256 = "03mnmzq72844hzyw7iq5g4gm1ihpqkg4i9dgj2yln1ghwk843hq6";
vendorHash = "sha256-BsNB0OTwBUu9kK+lSN7EF8ZQH3kFx8P9h4QgcfCvtg4=";
passthru.tests = { inherit (nixosTests.prometheus-exporters) rtl_433; };

File diff suppressed because it is too large Load Diff

@ -11,19 +11,19 @@
rustPlatform.buildRustPackage rec {
pname = "qdrant";
version = "1.4.1";
version = "1.5.0";
src = fetchFromGitHub {
owner = "qdrant";
repo = "qdrant";
rev = "refs/tags/v${version}";
sha256 = "sha256-28ugr0AiAgyE3KGK3LYHti2iTRslAhEKfy35xKyW/N8=";
sha256 = "sha256-kJfLaXJEeAkn5dh/m6NPLQ8T8ec53jBlT4E0CdnRCSI=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"quantization-0.1.0" = "sha256-pV+lfO0LV/+jOV+v/oQADsde6a8XKNah0OVJdTnzdvw=";
"quantization-0.1.0" = "sha256-FfjLNSPjgVTx2ReqqMeyYujnCz9fPgjWX99r3Lik8oA=";
"tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE=";
"wal-0.1.2" = "sha256-sMleBUAZcSnUx7/oQZr9lSDmVHxUjfGaVodvVtFEle0=";
};

@ -9,25 +9,29 @@ let
);
staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";
emulator = stdenv.hostPlatform.emulator buildPackages;
libcxxStdenvSuffix = lib.optionalString (stdenv.cc.libcxx != null) "-libcxx";
in stdenv.mkDerivation {
name = "cc-wrapper-test";
pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}";
version = stdenv.cc.version;
buildCommand = ''
echo "Testing: ${stdenv.cc.name}" >&2
echo "With libc: ${stdenv.cc.libc.name}" >&2
set -o pipefail
NIX_DEBUG=1 $CC -v
NIX_DEBUG=1 $CXX -v
printf "checking whether compiler builds valid C binaries... " >&2
echo "checking whether compiler builds valid C binaries... " >&2
$CC -o cc-check ${./cc-main.c}
${emulator} ./cc-check
printf "checking whether compiler builds valid C++ binaries... " >&2
echo "checking whether compiler builds valid C++ binaries... " >&2
$CXX -o cxx-check ${./cxx-main.cc}
${emulator} ./cxx-check
${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) ''
printf "checking whether compiler can build with CoreFoundation.framework... " >&2
echo "checking whether compiler can build with CoreFoundation.framework... " >&2
mkdir -p foo/lib
$CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c}
${emulator} ./core-foundation-check
@ -35,11 +39,11 @@ in stdenv.mkDerivation {
${lib.optionalString (!stdenv.isDarwin) ''
printf "checking whether compiler builds valid static C binaries... " >&2
echo "checking whether compiler builds valid static C binaries... " >&2
$CC ${staticLibc} -static -o cc-static ${./cc-main.c}
${emulator} ./cc-static
${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") ''
printf "checking whether compiler builds valid static pie C binaries... " >&2
echo "checking whether compiler builds valid static pie C binaries... " >&2
$CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c}
${emulator} ./cc-static-pie
''}
@ -48,7 +52,7 @@ in stdenv.mkDerivation {
${# See: https://github.com/llvm/llvm-project/commit/ed1d07282cc9d8e4c25d585e03e5c8a1b6f63a74
# `gcc` does not support this so we gate the test on `clang`
lib.optionalString stdenv.cc.isClang ''
printf "checking whether cc-wrapper accepts -- followed by positional (file) args..." >&2
echo "checking whether cc-wrapper accepts -- followed by positional (file) args..." >&2
mkdir -p positional
# Make sure `--` is not parsed as a "non flag arg"; we should get an
@ -66,13 +70,13 @@ in stdenv.mkDerivation {
${emulator} ./positional/main
''}
printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2
echo "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2
mkdir -p foo/include
cp ${./foo.c} foo/include/foo.h
NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" $CC -o cflags-check ${./cflags-main.c}
${emulator} ./cflags-check
printf "checking whether compiler uses NIX_LDFLAGS... " >&2
echo "checking whether compiler uses NIX_LDFLAGS... " >&2
mkdir -p foo/lib
$CC -shared \
${lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \
@ -83,7 +87,7 @@ in stdenv.mkDerivation {
NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
${emulator} ./ldflags-check
printf "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2
echo "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2
mkdir -p std-include
cp ${./stdio.h} std-include/stdio.h
NIX_DEBUG=1 $CC -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c}
@ -92,7 +96,7 @@ in stdenv.mkDerivation {
${emulator} ./nostdinc-main++
${lib.optionalString sanitizersWorking ''
printf "checking whether sanitizers are fully functional... ">&2
echo "checking whether sanitizers are fully functional... ">&2
$CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers
''}

@ -3,23 +3,84 @@
with pkgs;
{
cc-wrapper = callPackage ./cc-wrapper { };
cc-wrapper-gcc = callPackage ./cc-wrapper { stdenv = gccStdenv; };
cc-wrapper-gcc7 = callPackage ./cc-wrapper { stdenv = gcc7Stdenv; };
cc-wrapper-gcc8 = callPackage ./cc-wrapper { stdenv = gcc8Stdenv; };
cc-wrapper-gcc9 = callPackage ./cc-wrapper { stdenv = gcc9Stdenv; };
cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; };
cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
cc-wrapper-clang-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.stdenv; };
cc-wrapper-libcxx-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
cc-wrapper-clang-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.stdenv; };
cc-wrapper-libcxx-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
cc-wrapper-clang-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.stdenv; };
cc-wrapper-libcxx-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.libcxxStdenv; };
cc-wrapper-clang-8 = callPackage ./cc-wrapper { stdenv = llvmPackages_8.stdenv; };
cc-wrapper-libcxx-8 = callPackage ./cc-wrapper { stdenv = llvmPackages_8.libcxxStdenv; };
cc-wrapper-clang-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.stdenv; };
cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; };
cc-wrapper = with builtins; let
pkgNames = (attrNames pkgs);
llvmTests = let
pkgSets = lib.pipe pkgNames [
(filter (lib.hasPrefix "llvmPackages"))
(filter (n: n != "llvmPackages_rocm"))
(filter (n: n != "llvmPackages_latest"))
(filter (n: n != "llvmPackages_git"))
];
tests = lib.genAttrs pkgSets (name: recurseIntoAttrs {
clang = callPackage ./cc-wrapper { stdenv = pkgs.${name}.stdenv; };
libcxx = callPackage ./cc-wrapper { stdenv = pkgs.${name}.libcxxStdenv; };
});
in
tests;
gccTests = let
pkgSets = lib.pipe (attrNames pkgs) ([
(filter (lib.hasPrefix "gcc"))
(filter (lib.hasSuffix "Stdenv"))
(filter (n: n != "gccCrossLibcStdenv"))
] ++ lib.optionals (!(
(stdenv.buildPlatform.isLinux && stdenv.buildPlatform.isx86_64) &&
(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64)
)) [
(filter (n: !lib.hasSuffix "MultiStdenv" n))
]);
in lib.genAttrs pkgSets (name: callPackage ./cc-wrapper { stdenv = pkgs.${name}; });
in recurseIntoAttrs {
default = callPackage ./cc-wrapper { };
supported = stdenv.mkDerivation {
name = "cc-wrapper-supported";
builtGCC =
let
names = lib.pipe (attrNames gccTests) ([
(filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.cc))
# Broken
(filter (n: n != "gcc49Stdenv"))
(filter (n: n != "gccMultiStdenv"))
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
# fails with things like
# ld: warning: ld: warning: object file (trunctfsf2_s.o) was built for newer macOS version (11.0) than being linked (10.5)
# ld: warning: ld: warning: could not create compact unwind for ___fixunstfdi: register 20 saved somewhere other than in frame
(filter (n: n != "gcc11Stdenv"))
]);
in
toJSON (lib.genAttrs names (name: { name = pkgs.${name}; }));
builtLLVM =
let
names = lib.pipe (attrNames llvmTests) ([
(filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.stdenv.cc))
(filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.libcxxStdenv.cc))
# libcxxStdenv broken
# fix in https://github.com/NixOS/nixpkgs/pull/216273
] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
# libcxx does not build for some reason on aarch64-linux
(filter (n: n != "llvmPackages_7"))
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
(filter (n: n != "llvmPackages_5"))
(filter (n: n != "llvmPackages_6"))
(filter (n: n != "llvmPackages_7"))
(filter (n: n != "llvmPackages_8"))
(filter (n: n != "llvmPackages_9"))
(filter (n: n != "llvmPackages_10"))
]);
in
toJSON (lib.genAttrs names (name: { stdenv = pkgs.${name}.stdenv; libcxx = pkgs.${name}.libcxxStdenv; }));
buildCommand = ''
touch $out
'';
};
llvmTests = recurseIntoAttrs llvmTests;
inherit gccTests;
};
stdenv-inputs = callPackage ./stdenv-inputs { };
stdenv = callPackage ./stdenv { };

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "papeer";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "lapwat";
repo = pname;
rev = "v${version}";
hash = "sha256-oXhAiw2oYefmF+a8DqjP2f3AY0+WZ1ZdiNG9bEhSQ84=";
hash = "sha256-Kdy660FuPjXYF/uqndljmIvA6r+lo3D86W9pK6KqXl0=";
};
vendorHash = "sha256-3QRSdkx9p0H+zPB//bpWCBKKjKjrx0lHMk5lFm+U7pA=";

@ -3006,6 +3006,8 @@ self: super: with self; {
djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
djangorestframework-stubs = callPackage ../development/python-modules/djangorestframework-stubs { };
django-reversion = callPackage ../development/python-modules/django-reversion { };
django-sekizai = callPackage ../development/python-modules/django-sekizai { };

@ -89,9 +89,9 @@ let
# Tests
/*
jobs.tests.cc-wrapper.x86_64-darwin
jobs.tests.cc-wrapper-clang.x86_64-darwin
jobs.tests.cc-wrapper-libcxx.x86_64-darwin
jobs.tests.cc-wrapper.default.x86_64-darwin
jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
jobs.tests.stdenv-inputs.x86_64-darwin
jobs.tests.macOSSierraShared.x86_64-darwin
jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
@ -124,18 +124,18 @@ let
jobs.cachix.x86_64-linux
/*
jobs.tests.cc-wrapper.x86_64-linux
jobs.tests.cc-wrapper-gcc7.x86_64-linux
jobs.tests.cc-wrapper-gcc8.x86_64-linux
jobs.tests.cc-wrapper.default.x86_64-linux
jobs.tests.cc-wrapper.gcc7Stdenv.x86_64-linux
jobs.tests.cc-wrapper.gcc8Stdenv.x86_64-linux
# broken see issue #40038
jobs.tests.cc-wrapper-clang.x86_64-linux
jobs.tests.cc-wrapper-libcxx.x86_64-linux
jobs.tests.cc-wrapper-clang-5.x86_64-linux
jobs.tests.cc-wrapper-libcxx-5.x86_64-linux
jobs.tests.cc-wrapper-clang-6.x86_64-linux
jobs.tests.cc-wrapper-libcxx-6.x86_64-linux
jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-linux
jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-linux
jobs.tests.cc-wrapper.llvmPackages_5.clang.x86_64-linux
jobs.tests.cc-wrapper.llvmPackages_5.libcxx.x86_64-linux
jobs.tests.cc-wrapper.llvmPackages_6.clang.x86_64-linux
jobs.tests.cc-wrapper.llvmPackages_6.libcxx.x86_64-linux
jobs.tests.cc-multilib-gcc.x86_64-linux
jobs.tests.cc-multilib-clang.x86_64-linux
jobs.tests.stdenv-inputs.x86_64-linux
@ -158,15 +158,15 @@ let
jobs.inkscape.x86_64-darwin
jobs.qt5.qtmultimedia.x86_64-darwin
/*
jobs.tests.cc-wrapper.x86_64-darwin
jobs.tests.cc-wrapper-gcc7.x86_64-darwin
# jobs.tests.cc-wrapper-gcc8.x86_64-darwin
jobs.tests.cc-wrapper-clang.x86_64-darwin
jobs.tests.cc-wrapper-libcxx.x86_64-darwin
jobs.tests.cc-wrapper-clang-5.x86_64-darwin
jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
jobs.tests.cc-wrapper-clang-6.x86_64-darwin
jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
jobs.tests.cc-wrapper.default.x86_64-darwin
jobs.tests.cc-wrapper.gcc7Stdenv.x86_64-darwin
jobs.tests.cc-wrapper.gcc8Stdenv.x86_64-darwin
jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
jobs.tests.cc-wrapper.llvmPackages_5.clang.x86_64-darwin
jobs.tests.cc-wrapper.llvmPackages_5.libcxx.x86_64-darwin
jobs.tests.cc-wrapper.llvmPackages_6.clang.x86_64-darwin
jobs.tests.cc-wrapper.llvmPackages_6.libcxx.x86_64-darwin
jobs.tests.stdenv-inputs.x86_64-darwin
jobs.tests.macOSSierraShared.x86_64-darwin
jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin