nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-06-11 18:01:25 +00:00 committed by GitHub
commit d8fa49b70c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 289 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributing/reviewing-contributions.chapter.md
View File

@ -12,7 +12,7 @@ When reviewing a pull request, please always be nice and polite. Controversial c
GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution.
pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
Pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking.

82
pkgs/applications/audio/muzika/default.nix Normal file
View File

@ -0,0 +1,82 @@
{ lib
, desktop-file-utils
, fetchFromGitHub
, fetchYarnDeps
, fixup_yarn_lock
, gjs
, glib-networking
, gobject-introspection
, gst_all_1
, gtk4
, libadwaita
, libsoup_3
, meson
, ninja
, pkg-config
, stdenv
, wrapGAppsHook4
, yarn
, nodejs
}:
stdenv.mkDerivation rec {
pname = "muzika";
version = "unstable-2023-06-07";
src = fetchFromGitHub {
owner = "vixalien";
repo = "muzika";
rev = "d0ca7eebad67082e73513ebd7ca04edb1fdec7ce";
hash = "sha256-ycnHpyYaUJZgproTLCWCVzsvnUisXlq3fqlij1KryWA=";
fetchSubmodules = true;
};
nativeBuildInputs = [
desktop-file-utils
gobject-introspection
meson
ninja
nodejs
pkg-config
wrapGAppsHook4
yarn
];
buildInputs = [
gjs
glib-networking
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gtk4
libadwaita
libsoup_3
];
yarnOfflineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-FvPEbYIydgfyKKsf2jnXUbPEhIboPi3wR7BWzEuo72Q=";
};
preConfigure = ''
export HOME="$PWD"
yarn config --offline set yarn-offline-mirror $yarnOfflineCache
${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
'';
mesonFlags = [
"-Dyarnrc=../.yarnrc"
];
postFixup = ''
sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.vixalien.muzika';" $out/bin/.com.vixalien.muzika-wrapped
ln -s $out/bin/com.vixalien.muzika $out/bin/muzika
'';
meta = with lib; {
description = "Elegant music streaming app";
homepage = "https://github.com/vixalien/muzika";
license = licenses.gpl3Only;
maintainers = with maintainers; [ onny ];
};
}

6
pkgs/applications/networking/cluster/istioctl/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.17.2";
version = "1.18.0";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-YEkvY+Z+zM+9t+vnVk0gXJRTJd0u/Ryk3hYkbSHwP8M=";
sha256 = "sha256-vC8EE9v3U6FNbjxWb3At+gL4DUgBIb7MY2xBu7WNMKw=";
};
vendorHash = "sha256-LMmWhKwuy+HfqkLabTjlTd0f/6DYCGbEzpItQvckE9g=";
vendorHash = "sha256-YgRW/sVRQLqrtEFxC+bGHZEQoEro5bzNzqKv7c7iO4Y=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/desktops/gnome/core/gnome-shell/default.nix
View File

@ -67,13 +67,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "44.1";
version = "44.2";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "C/vkOU0mdiUVTQjQFGe9vZnoFXUS/I30XVwC3bdVHKY=";
sha256 = "VfJ57GMDt8DIkkbs7YEkfIf8HHOUj0XrISpkchjRtj8=";
};
patches = [

4
pkgs/desktops/gnome/core/mutter/default.nix
View File

@ -66,13 +66,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
version = "44.1";
version = "44.2";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
sha256 = "lzrq+rQvBvk0oJlPyEh4lYzbTSdmpMhnpczcVH3VcFY=";
sha256 = "N1ZtflXJPciJTpx/I6e6WHmoswuvZVWCIwCdK0Z0AqE=";
};
mesonFlags = [

14
pkgs/development/compilers/dtc/default.nix
View File

@ -14,13 +14,13 @@
, libyaml
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dtc";
version = "1.7.0";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev = "refs/tags/v${version}";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc=";
};
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
})
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
nativeBuildInputs = [
meson
@ -72,9 +72,9 @@ stdenv.mkDerivation rec {
# meson.build: bump version to 1.7.0
substituteInPlace libfdt/meson.build \
--replace "version: '1.6.0'," "version: '${version}',"
--replace "version: '1.6.0'," "version: '${finalAttrs.version}',"
substituteInPlace meson.build \
--replace "version: '1.6.0'," "version: '${version}',"
--replace "version: '1.6.0'," "version: '${finalAttrs.version}',"
'';
# Required for installation of Python library and is innocuous otherwise.
@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
mesonAutoFeatures = "auto";
mesonFlags = [
(lib.mesonBool "static-build" stdenv.hostPlatform.isStatic)
(lib.mesonBool "tests" doCheck)
(lib.mesonBool "tests" finalAttrs.doCheck)
];
# Checks are broken on aarch64 darwin
@ -97,4 +97,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.dezgeg ];
platforms = platforms.unix;
};
}
})

13
pkgs/development/python-modules/click-command-tree/default.nix
View File

@ -1,31 +1,22 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, click
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "click-command-tree";
version = "1.1.0";
version = "1.1.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "whwright";
repo = pname;
rev = version;
hash = "sha256-vFOcn+ibyLZnhU3OQMtnHI04UqAY2/CCvhq4EEU4XFo=";
hash = "sha256-uBp7462LutL8aFRFix3pbVYbSf1af6k0nW0J0HhJa1U=";
};
patches = [
(fetchpatch {
name = "remove-setup-downloading-flake8.patch";
url = "https://github.com/whwright/click-command-tree/commit/1ecfcfa29bf01e1131e6ec712bd7338ac1283dc8.patch";
hash = "sha256-u5jsNfEo1+XNlkVGPCM/rsDPnYko6cr2z2si9nq+sLA=";
})
];
propagatedBuildInputs = [
click
];

16
pkgs/development/python-modules/dnachisel/default.nix
View File

@ -7,6 +7,7 @@
, numpy
, proglog
, pytestCheckHook
, pythonOlder
, python-codon-tables
, primer3
, genome-collector
@ -15,13 +16,16 @@
buildPythonPackage rec {
pname = "dnachisel";
version = "3.2.10";
version = "3.2.11";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Edinburgh-Genome-Foundry";
repo = "DnaChisel";
rev = "refs/tags/v${version}";
hash = "sha256-YlNOvK7ZXUHYdRX1NFEdZ646NGLtGXU1YgAjN6RY2QE=";
hash = "sha256-rcZq/HhU1xIyQ1jM8+gO9ONDLBAxiUIByoWk2nMwuGA=";
};
propagatedBuildInputs = [
@ -50,12 +54,16 @@ buildPythonPackage rec {
"test_avoid_phage_blast_matches"
"test_avoid_matches_with_list"
"test_avoid_matches_with_phage"
];
pythonImportsCheck = [ "dnachisel" ];
];
pythonImportsCheck = [
"dnachisel"
];
meta = with lib; {
homepage = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel";
description = "Optimize DNA sequences under constraints";
changelog = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
};

16
pkgs/development/python-modules/pymedio/default.nix
View File

@ -12,22 +12,21 @@
buildPythonPackage rec {
pname = "pymedio";
version = "0.2.13";
version = "0.2.14";
format = "setuptools";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "jcreinhold";
repo = "pymedio";
rev = "refs/tags/v${version}";
hash = "sha256-iHbClOrtYkHT1Nar+5j/ig4Krya8LdQdFB4Mmm5B9bg=";
hash = "sha256-x3CHoWASDrUoCXfj73NF+0Y/3Mb31dK2Lh+o4OD9ryk=";
};
# relax Python dep to work with 3.10.x and 3.11.x
postPatch = ''
substituteInPlace setup.cfg --replace "!=3.10.*," "" --replace "!=3.11.*" ""
'';
propagatedBuildInputs = [ numpy ];
propagatedBuildInputs = [
numpy
];
nativeCheckInputs = [
pytestCheckHook
@ -44,6 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Read medical image files into Numpy arrays";
homepage = "https://github.com/jcreinhold/pymedio";
changelog = "https://github.com/jcreinhold/pymedio/blob/v${version}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};

6
pkgs/development/tools/continuous-integration/dagger/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dagger";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "dagger";
repo = "dagger";
rev = "v${version}";
hash = "sha256-NFQ1VPgY3WDwMsOi0wZ/b7sV/Ckv/WCeegSyLCnOPJM=";
hash = "sha256-9QQ6aDCkTWNq5KOSGF6FH6UQrOYa51ctW3CMcGrCJAQ=";
};
vendorHash = "sha256-KniHuJWkwZEzFcdtZUaYEoqcvmotbO+yuEB5L3Q3FGI=";
vendorHash = "sha256-r1E0JrwLDMlBINxtHKI5XfrG4kYWRcuep8CvtvVCqio=";
proxyVendor = true;
subPackages = [

26
pkgs/development/tools/language-servers/neocmakelsp/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "neocmakelsp";
version = "0.5.18";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "neocmakelsp";
rev = "v${version}";
hash = "sha256-3Bv1tRskxQ4Fk+gEGCYRq8WtkBHYP2VjirtTZ3SWJlQ=";
};
cargoHash = "sha256-O8E5PmXYrNOB8fXFs5ar30c1X5flIQZ/lrRSl/3XH+o=";
meta = with lib; {
description = "A cmake lsp based on tower-lsp and treesitter";
homepage = "https://github.com/Decodetalkers/neocmakelsp";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ rewine ];
};
}

34
pkgs/development/tools/misc/ezno/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "ezno";
version = "0.0.8";
src = fetchFromGitHub {
owner = "kaleidawave";
repo = "ezno";
rev = "release/ezno-${version}";
hash = "sha256-0yLEpNkl7KjBEGxNONtfMjVlWMSKGZ6TbYJMsCeQ3ms=";
};
cargoHash = "sha256-noMfKx6BsmWhAVI4r8LlC961Uwogv1JGMYSrNGlLGPQ=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
cargoBuildFlags = [ "--bin" "ezno" ];
meta = with lib; {
description = "A JavaScript compiler and TypeScript checker with a focus on static analysis and runtime performance";
homepage = "https://github.com/kaleidawave/ezno";
changelog = "https://github.com/kaleidawave/ezno/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

6
pkgs/development/tools/misc/funzzy/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "funzzy";
version = "0.6.1";
version = "1.0.0";
src = fetchFromGitHub {
owner = "cristianoliveira";
repo = "funzzy";
rev = "v${version}";
hash = "sha256-Vfx/AJTeMM5GwIhDTqoteVIdr7tx4tea7SKAczauUjo=";
hash = "sha256-6rScRkiVot6VORpCu8kMOun8q2QKaNDQ8Qh9LfEUYis=";
};
cargoHash = "sha256-uOhlx38URy7+LqYhUi/hRtfr84visq0wqCU3qm42IKo=";
cargoHash = "sha256-KQWesfmFmAo8rC7GoqyufnEGA+tgOLGA950O6lSWWEg=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices

4
pkgs/misc/dxvk/default.nix
View File

@ -27,8 +27,8 @@ stdenvNoCC.mkDerivation (finalAttrs:
--subst-var-by bash ${bash} \
--subst-var-by dxvk32 ${dxvk32} \
--subst-var-by dxvk64 ${dxvk64} \
--subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \
--subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}"
--subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads_pre_gcc_13}" \
--subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads_pre_gcc_13}"
chmod a+x $out/bin/setup_dxvk.sh
declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} )
for arch in "''${!dxvks[@]}"; do

4
pkgs/os-specific/windows/default.nix
View File

@ -33,6 +33,10 @@ lib.makeScope newScope (self: with self; {
stdenv = crossThreadsStdenv;
};
mcfgthreads_pre_gcc_13 = callPackage ./mcfgthreads/pre_gcc_13.nix {
stdenv = crossThreadsStdenv;
};
mcfgthreads = callPackage ./mcfgthreads {
stdenv = crossThreadsStdenv;
};

11
pkgs/os-specific/windows/mcfgthreads/default.nix
View File

@ -2,22 +2,17 @@
stdenv.mkDerivation {
pname = "mcfgthreads";
version = "git";
version = "unstable-2023-06-06";
src = fetchFromGitHub {
owner = "lhmouse";
repo = "mcfgthread";
rev = "c446cf4fcdc262fc899a188a4bb7136284c34222";
sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f";
rev = "f0a335ce926906d634c787249a89220045bf0f7e";
hash = "sha256-PLGIyoLdWgWvkHgRe0vHLIvnCxFpmHtbjS8xRhNM9Xw=";
};
outputs = [ "out" "dev" ];
# Don't want prebuilt binaries sneaking in.
postUnpack = ''
rm -r "$sourceRoot/debug" "$sourceRoot/release"
'';
nativeBuildInputs = [
autoreconfHook
];

24
pkgs/os-specific/windows/mcfgthreads/pre_gcc_13.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation {
pname = "mcfgthreads";
version = "git"; # unstable-2021-03-12, not in any branch
src = fetchFromGitHub {
owner = "lhmouse";
repo = "mcfgthread";
rev = "c446cf4fcdc262fc899a188a4bb7136284c34222";
sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f";
};
outputs = [ "out" "dev" ];
# Don't want prebuilt binaries sneaking in.
postUnpack = ''
rm -r "$sourceRoot/debug" "$sourceRoot/release"
'';
nativeBuildInputs = [
autoreconfHook
];
}

32
pkgs/tools/networking/ain/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "ain";
version = "1.3.0";
src = fetchFromGitHub {
owner = "jonaslu";
repo = "ain";
rev = "v${version}";
hash = "sha256-QBtnVtTGONbYToGhZ0L4CZ3o2hViEN1l94ZKJHVMd1w=";
};
vendorHash = "sha256-eyB+0D0+4hHG4yKDj/m9QB+8YTyv+por8fTyu/WcZyg=";
ldflags = [
"-s"
"-w"
"-X=main.gitSha=${src.rev}"
];
meta = with lib; {
description = "A HTTP API client for the terminal";
homepage = "https://github.com/jonaslu/ain";
changelog = "https://github.com/jonaslu/ain/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

6
pkgs/tools/security/b3sum/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "b3sum";
version = "1.3.3";
version = "1.4.0";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-PeH4oMeLxEM1pKqMsZBhsbmZOAVdLEmWKyPjuRNjowA=";
sha256 = "sha256-rh5xELjiwm5rSFVgIMZUMG4J/VxKKF8xrxX/wK+sVF8=";
};
cargoSha256 = "sha256-dvxQY1KgZGOCIeFoxfOewF9gm9xORLelJxJMMtrNWDs=";
cargoHash = "sha256-q10NC3QH4+ExF4vO6j/Ud8LenzXIuhZC8Yyev+2gJNU=";
meta = {
description = "BLAKE3 cryptographic hash function";

10
pkgs/tools/security/gosh/default.nix
View File

@ -5,18 +5,16 @@
buildGoModule rec {
pname = "gosh";
# https://github.com/redcode-labs/GoSH/issues/4
version = "2020523-${lib.strings.substring 0 7 rev}";
rev = "7ccb068279cded1121eacc5a962c14b2064a1859";
version = "1.0.0";
src = fetchFromGitHub {
owner = "redcode-labs";
repo = "GoSH";
inherit rev;
sha256 = "143ig0lqnkpnydhl8gnfzhg613x4wc38ibdbikkqwfyijlr6sgzd";
rev = "refs/tags/v${version}";
hash = "sha256-h4WqaN2okAeaU/+0fs8zLYDtyQLuLkCDdGrkGz8rdhg=";
};
vendorSha256 = "sha256-ITz6nkhttG6bsIZLsp03rcbEBHUQ7pFl4H6FOHTXIU4=";
vendorHash = "sha256-ITz6nkhttG6bsIZLsp03rcbEBHUQ7pFl4H6FOHTXIU4=";
subPackages = [ "." ];

6
pkgs/tools/security/smbmap/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "smbmap";
version = "unstable-2023-03-29";
version = "1.9.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "ShawnDEvans";
repo = "smbmap";
rev = "ce60773320e11b2ecd1ce1b5ab2a62d43d4a4423";
hash = "sha256-4DdiICH3B7x8Wr5CcqiuhCHPv6W/5bT5MGdXkyE0OKA=";
rev = "refs/tags/v${version}";
hash = "sha256-NsxmH1W5VUckGvqqTIrxhaVz0l7gsHmc8KJuvC/iVbA=";
};
propagatedBuildInputs = with python3.pkgs; [

39
pkgs/top-level/all-packages.nix
View File

@ -1454,6 +1454,8 @@ with pkgs;
aide = callPackage ../tools/security/aide { };
ain = callPackage ../tools/networking/ain { };
aioblescan = with python3Packages; toPythonApplication aioblescan;
aiodnsbrute = callPackage ../tools/security/aiodnsbrute { };
@ -15112,7 +15114,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
isl = if !stdenv.isDarwin then isl_0_14 else null;
cloog = if !stdenv.isDarwin then cloog else null;
@ -15126,7 +15128,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
isl = if !stdenv.isDarwin then isl_0_11 else null;
@ -15143,7 +15145,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
# gcc 10 is too strict to cross compile gcc <= 8
stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;
@ -15162,7 +15164,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
# gcc 10 is too strict to cross compile gcc <= 8
stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;
@ -15177,7 +15179,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
# gcc 10 is too strict to cross compile gcc <= 8
stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;
@ -15192,7 +15194,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
isl = if !stdenv.isDarwin then isl_0_20 else null;
}));
@ -15204,7 +15206,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
isl = if !stdenv.isDarwin then isl_0_20 else null;
}));
@ -15216,7 +15218,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
isl = if !stdenv.isDarwin then isl_0_20 else null;
}));
@ -15228,7 +15230,7 @@ with pkgs;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { };
isl = if !stdenv.isDarwin then isl_0_20 else null;
}));
@ -16839,7 +16841,10 @@ with pkgs;
# want the C++ library to be explicitly chosen by the caller, and null by
# default.
libcxx ? null
, extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross.package
, extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW)
(if lib.versionAtLeast cc.version "13"
then threadsCross.package
else threadsCross_pre_gcc_13.package)
, nixSupport ? {}
, ...
} @ extraArgs:
@ -17752,6 +17757,8 @@ with pkgs;
millet = callPackage ../development/tools/language-servers/millet { };
neocmakelsp = callPackage ../development/tools/language-servers/neocmakelsp { };
nil = callPackage ../development/tools/language-servers/nil { };
nls = callPackage ../development/tools/language-servers/nls { };
@ -18471,6 +18478,8 @@ with pkgs;
explain = callPackage ../development/tools/explain { };
ezno = callPackage ../development/tools/misc/ezno { };
func = callPackage ../applications/networking/cluster/func { };
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
@ -20812,6 +20821,14 @@ with pkgs;
libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;
threadsCross_pre_gcc_13 = if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)
then {
# other possible values: win32 or posix
model = "mcf";
# For win32 or posix set this to null
package = targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13;
} else { };
threadsCross = if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)
then {
# other possible values: win32 or posix
@ -31114,6 +31131,8 @@ with pkgs;
molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
muzika = callPackage ../applications/audio/muzika { };
pattypan = callPackage ../applications/misc/pattypan {
jdk = jdk.override { enableJavaFX = true; };
};