mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
Merge staging-next-22.05 into staging-22.05
This commit is contained in:
github-actions[bot]
@@ -251,6 +251,8 @@ in {
|
||||
] ++ lib.optional config.security.rtkit.enable "rtkit";
|
||||
description = "Pipewire system service user";
|
||||
isSystemUser = true;
|
||||
home = "/var/lib/pipewire";
|
||||
createHome = true;
|
||||
};
|
||||
groups.pipewire.gid = config.ids.gids.pipewire;
|
||||
};
|
||||
|
||||
@@ -9,6 +9,12 @@ let
|
||||
};
|
||||
interfaceOptions = {
|
||||
options = {
|
||||
autoStart = mkOption {
|
||||
default = true;
|
||||
description = "Whether this VPN connection should be started automatically.";
|
||||
type = types.bool;
|
||||
};
|
||||
|
||||
gateway = mkOption {
|
||||
description = "Gateway server to connect to.";
|
||||
example = "gateway.example.com";
|
||||
@@ -95,7 +101,7 @@ let
|
||||
description = "OpenConnect Interface - ${name}";
|
||||
requires = [ "network-online.target" ];
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = optional icfg.autoStart "multi-user.target";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
|
||||
@@ -14,17 +14,17 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0yahcv64jblmz5q0ylgg1sghcnyam4nq47var3y18ndjpaqyb1fl";
|
||||
x86_64-darwin = "0zsizwrhc0na9dfics27i48q4x3kz0qq5m2vdjvrgi69y2iy5z4c";
|
||||
aarch64-linux = "01wpi9pdf1fjxfx8w5g5da31q561qw7ykjm9spb3arvnivq20dp2";
|
||||
aarch64-darwin = "0qk22jyn0vypsx8x4cmpab5wrmhqx6hdkm314k8k06mz5cg1v4r3";
|
||||
armv7l-linux = "04r0x31flahzw8y0kkbzqnvcwllifaa0ysr163bb5b8kiyc189kk";
|
||||
x86_64-linux = "1kvb92ygsvzi06nqwd6d9dlqbz44dxcjm0iq1rvvxnr7x33l8218";
|
||||
x86_64-darwin = "0jz0nik6wkqhgmfnhiwsq510hxbc9jw0z7s84154p2lhwcmpsbjp";
|
||||
aarch64-linux = "16jzpzxxmcq690d3w0ph0cnzhpyvjpk8ih48pyzzf25bgp94yi33";
|
||||
aarch64-darwin = "00xw4xml4zijpqj8305gdgn15shllpkv9ld1yh1aqrz11v522w3h";
|
||||
armv7l-linux = "0fzzdh9gkw51djrdwhzi3fbjxkm2l78v72gc0233xm8riq0gczsv";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.67.2";
|
||||
version = "1.68.0";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@@ -1,20 +1,32 @@
|
||||
{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, atk
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
, pango
|
||||
, python3Packages
|
||||
, txt2tags
|
||||
, wrapGAppsHook
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xdgmenumaker";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gapan";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif";
|
||||
sha256 = "Q38m8YrvkkTCY2dByvPj+Ee1DMSUbWvwSDI0kW182bU=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
txt2tags
|
||||
@@ -22,26 +34,30 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
atk
|
||||
gdk-pixbuf
|
||||
pango
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
pyxdg
|
||||
pygobject3
|
||||
pyxdg
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"DESTDIR="
|
||||
];
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool that generates XDG menus for several window managers";
|
||||
homepage = "https://github.com/gapan/xdgmenumaker";
|
||||
license = licenses.gpl2Plus;
|
||||
license = licenses.gpl3Plus;
|
||||
# NOTE: exclude darwin from platforms because Travis reports hash mismatch
|
||||
platforms = with platforms; filter (x: !(elem x darwin)) unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "102.0.5005.61",
|
||||
"sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
|
||||
"sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv",
|
||||
"version": "102.0.5005.115",
|
||||
"sha256": "1rj7vy824vn513hiivc90lnxvxyi2s0qkdmfqsdssv9v6zjl079h",
|
||||
"sha256bin64": "0b32sscbjnvr98lk962i9k2srckv2s7fp9pifmsv5jlwndjhzm7y",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-04-14",
|
||||
@@ -12,10 +12,10 @@
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "102.0.5005.27",
|
||||
"sha256_linux": "1978xwj9kf8nihgakmnzgibizq6wp74qp2d2fxgrsgggjy1clmbv",
|
||||
"sha256_darwin": "0abnqpdm5hgirzj9g2zwkjcc7cwnnr3va4qn09g5yqndlbvi9nqd",
|
||||
"sha256_darwin_aarch64": "0mw7vypghnw3qdci8g11hgfwbfln471dq1mymxn4bi7691xxb6a2"
|
||||
"version": "102.0.5005.61",
|
||||
"sha256_linux": "0fzmvggb4jkjx8cdanarlqqava8xdf3z5wrx560x7772pgd7q02b",
|
||||
"sha256_darwin": "1y6wq5waivrc5svlwj1svcsh0w72lp68kid52q4qwi044d0l25jg",
|
||||
"sha256_darwin_aarch64": "03xvmix3hkzlvsv1k5yai2hvsvv60in59n3wdwxkb79fdnkpr3i3"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
||||
@@ -243,19 +243,19 @@ rec {
|
||||
# Get revisions from
|
||||
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
|
||||
docker_20_10 = callPackage dockerGen rec {
|
||||
version = "20.10.16";
|
||||
version = "20.10.17";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Sktjh1JabeXrmWljLe5G934cxgChN0u3vdmQXasEFro=";
|
||||
sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8=";
|
||||
moby-src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "moby";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3dog2aGbFKiYzsPTXkG+bo9xjTWZYlmWxtrqXjdzO2s=";
|
||||
sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I=";
|
||||
};
|
||||
runcRev = "v1.1.1";
|
||||
runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY=";
|
||||
containerdRev = "v1.6.4";
|
||||
containerdSha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0=";
|
||||
runcRev = "v1.1.2";
|
||||
runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8=";
|
||||
containerdRev = "v1.6.6";
|
||||
containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8=";
|
||||
tiniRev = "v0.19.0";
|
||||
tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
|
||||
};
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-bluetooth";
|
||||
version = "42.0";
|
||||
version = "42.1";
|
||||
|
||||
# TODO: split out "lib"
|
||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "PR4nIGc7yaJCYZ3F0jH9bndsGKSdop9DzcQzBVrbAXA=";
|
||||
sha256 = "2f5dZz8npAqGqeI9k8uZNn57Bt9Rhy6KxezJk45Vtes=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
, ninja
|
||||
, vala
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, gtk3
|
||||
, granite
|
||||
, libgee
|
||||
@@ -20,17 +19,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-videos";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "videos";
|
||||
rev = version;
|
||||
sha256 = "sha256-3V8iDy68ngdFTJxAGimuGi4vPru32pHYevThA0RwNpE=";
|
||||
sha256 = "sha256-IUIY/WgGPVRYk9O+ZocopoBF7TlLnTtScNwO6gDCALw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-notifications";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "notifications";
|
||||
rev = version;
|
||||
sha256 = "sha256-AEcZVQPAQLa202/Yvq0GihY8BfMEH46iXeQ5u3QvuXg=";
|
||||
sha256 = "sha256-kM//T3P8gMGnCMDJ1caQQGgD6HBOQo0wp2wZGMUUPuU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -62,15 +62,6 @@ stdenv.mkDerivation rec {
|
||||
buildFlags = lib.optional headersOnly "generate-cxx-headers";
|
||||
installTargets = lib.optional headersOnly "install-cxx-headers";
|
||||
|
||||
# At this point, cxxabi headers would be installed in the dev output, which
|
||||
# prevents moveToOutput from doing its job later in the build process.
|
||||
postInstall = lib.optionalString (!headersOnly) ''
|
||||
mv "$dev/include/c++/v1/"* "$out/include/c++/v1/"
|
||||
pushd "$dev"
|
||||
rmdir -p include/c++/v1
|
||||
popd
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
isLLVM = true;
|
||||
};
|
||||
|
||||
@@ -1,85 +1,21 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b0569a4a54ca..7d665f5a3258 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -10,6 +10,8 @@ endif()
|
||||
#===============================================================================
|
||||
cmake_minimum_required(VERSION 3.13.4)
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
|
||||
|
||||
# Add path for custom modules
|
||||
@@ -415,13 +417,13 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||||
@@ -436,7 +436,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||||
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
|
||||
set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1")
|
||||
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1")
|
||||
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH
|
||||
"Path where built libc++ libraries should be installed.")
|
||||
- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
"Path where built libc++ runtime libraries should be installed.")
|
||||
- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH
|
||||
"Path where target-agnostic libc++ headers should be installed.")
|
||||
- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
|
||||
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
|
||||
"Path where target-specific libc++ headers should be installed.")
|
||||
if(LIBCXX_LIBDIR_SUBDIR)
|
||||
string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR})
|
||||
@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
|
||||
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
|
||||
set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1")
|
||||
@@ -453,7 +453,7 @@ else()
|
||||
set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1")
|
||||
endif()
|
||||
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}")
|
||||
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" CACHE PATH
|
||||
"Path where built libc++ libraries should be installed.")
|
||||
- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH
|
||||
"Path where built libc++ runtime libraries should be installed.")
|
||||
- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH
|
||||
"Path where target-agnostic libc++ headers should be installed.")
|
||||
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH
|
||||
"Path where target-specific libc++ headers should be installed.")
|
||||
@@ -443,11 +445,11 @@ else()
|
||||
set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX})
|
||||
set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1")
|
||||
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}")
|
||||
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH
|
||||
"Path where built libc++ libraries should be installed.")
|
||||
- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
"Path where built libc++ runtime libraries should be installed.")
|
||||
- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH
|
||||
+ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH
|
||||
"Path where target-agnostic libc++ headers should be installed.")
|
||||
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH
|
||||
"Path where target-specific libc++ headers should be installed.")
|
||||
diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake
|
||||
index 5a8a4a270a1a..d69405ddeeac 100644
|
||||
--- a/cmake/Modules/HandleLibCXXABI.cmake
|
||||
+++ b/cmake/Modules/HandleLibCXXABI.cmake
|
||||
@@ -1,8 +1,9 @@
|
||||
-
|
||||
#===============================================================================
|
||||
# Add an ABI library if appropriate
|
||||
#===============================================================================
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
#
|
||||
# _setup_abi: Set up the build to use an ABI library
|
||||
#
|
||||
@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs)
|
||||
|
||||
if (LIBCXX_INSTALL_HEADERS)
|
||||
install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}"
|
||||
- DESTINATION include/c++/v1/${dstdir}
|
||||
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}"
|
||||
COMPONENT cxx-headers
|
||||
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
|
||||
)
|
||||
|
||||
@@ -82,6 +82,5 @@ stdenv.mkDerivation rec {
|
||||
# the UIUC License (a BSD-like license)":
|
||||
license = with lib.licenses; [ mit ncsa ];
|
||||
maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ];
|
||||
broken = true; # TODO: gnu-install-dirs.patch fails to apply
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,46 +1,22 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 858f5d5cfd7f..16c67d7062be 100644
|
||||
index ecbc7091864e..53ba2dbc3bd1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -10,6 +10,8 @@ endif()
|
||||
|
||||
cmake_minimum_required(VERSION 3.13.4)
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
|
||||
|
||||
# Add path for custom modules
|
||||
@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH
|
||||
@@ -216,7 +216,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||||
set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
|
||||
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
|
||||
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
|
||||
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
|
||||
"Path where built libc++abi libraries should be installed.")
|
||||
- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
"Path where built libc++abi runtime libraries should be installed.")
|
||||
if(LIBCXX_LIBDIR_SUBDIR)
|
||||
string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR})
|
||||
@@ -224,16 +226,16 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||||
elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
|
||||
set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
|
||||
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
|
||||
@@ -230,7 +230,7 @@ else()
|
||||
set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR})
|
||||
set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
|
||||
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
|
||||
"Path where built libc++abi libraries should be installed.")
|
||||
- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
"Path where built libc++abi runtime libraries should be installed.")
|
||||
else()
|
||||
set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR})
|
||||
set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
|
||||
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
|
||||
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
|
||||
"Path where built libc++abi libraries should be installed.")
|
||||
- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
"Path where built libc++abi runtime libraries should be installed.")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -43,6 +43,5 @@ stdenv.mkDerivation rec {
|
||||
I). It is a dependency of the C++ ABI library, and sometimes is a
|
||||
dependency of other runtimes.
|
||||
'';
|
||||
broken = true; # TODO: gnu-install-dirs.patch fails to apply
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,65 +1,21 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e3cc66dd2226..1299b596ce0d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -8,6 +8,8 @@ endif()
|
||||
|
||||
cmake_minimum_required(VERSION 3.13.4)
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
|
||||
|
||||
# Add path for custom modules
|
||||
@@ -139,25 +141,27 @@ set(CMAKE_MODULE_PATH
|
||||
@@ -147,7 +147,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
|
||||
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||||
set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
|
||||
- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
|
||||
+ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH
|
||||
+ "Path where built libunwind headers should be installed.")
|
||||
+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
|
||||
"Path where built libunwind libraries should be installed.")
|
||||
- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
+ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
"Path where built libunwind runtime libraries should be installed.")
|
||||
if(LIBCXX_LIBDIR_SUBDIR)
|
||||
string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR})
|
||||
string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR})
|
||||
@@ -159,7 +159,7 @@ else()
|
||||
else()
|
||||
set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
-elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
|
||||
- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
|
||||
- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH
|
||||
- "Path where built libunwind libraries should be installed.")
|
||||
- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
- "Path where built libunwind runtime libraries should be installed.")
|
||||
else()
|
||||
- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
|
||||
- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH
|
||||
+ if(LLVM_LIBRARY_OUTPUT_INTDIR)
|
||||
+ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
|
||||
+ else()
|
||||
+ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})
|
||||
+ endif()
|
||||
+ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH
|
||||
+ "Path where built libunwind headers should be installed.")
|
||||
+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH
|
||||
"Path where built libunwind libraries should be installed.")
|
||||
- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH
|
||||
+ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
|
||||
"Path where built libunwind runtime libraries should be installed.")
|
||||
endif()
|
||||
|
||||
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
|
||||
index c3bb1dd0f69f..adf1766c44cb 100644
|
||||
--- a/include/CMakeLists.txt
|
||||
+++ b/include/CMakeLists.txt
|
||||
@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS)
|
||||
foreach(file ${files})
|
||||
get_filename_component(dir ${file} DIRECTORY)
|
||||
install(FILES ${file}
|
||||
- DESTINATION "include/${dir}"
|
||||
+ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}"
|
||||
COMPONENT unwind-headers
|
||||
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
|
||||
)
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amtk";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "g10IUHo96sie91NRzOu0szWv/qNhuIvQ+mZ/QM53enA=";
|
||||
sha256 = "frq8QpsO67KzI2DJv9vjaOSJs1w83AhqhWz8mzpGanI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-desktop";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-JDOrYG0kTDUk3luBIJTbimcPsR7Z/3GAwtAhrh/J/AU=";
|
||||
sha256 = "sha256-9CsU6sjRRWwr/B+8l+9q/knI3W9XeW6P1f6zkzHtVb0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gupnp-av";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "IK7VRvyILnij8YagyLzlyEHMOkS36lKCmPvcgllvsVY=";
|
||||
sha256 = "t5zgzEsMZtnFS8Ihg6EOVwmgAR0q8nICWUjvyrM6Pk8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tepl";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "J08Fa75V8wpq5EQq0i8VfQTTphtWjZC8hRF7txMgIME=";
|
||||
sha256 = "W0qcbGG9AAVT75eZ9MpiXQX1gBA2+ywvkopJRIyQPAk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -47,11 +47,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tracker-miners";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "izh967d0BhwGrfsmeg4ODz0heZNxvwHQVklaubjdlBc=";
|
||||
sha256 = "Pt3G0nLAKWn6TCwV360MSddtAh8aJ+xwi2m+gCU1PJQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-httpd";
|
||||
version = "2.4.53";
|
||||
version = "2.4.54";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
|
||||
sha256 = "sha256-0LvREhpXtfKm/5LXuW+AUMWkXT8U2xGPZJedUlhY22M=";
|
||||
sha256 = "sha256-6zl/7u/MryVPjUXeN2jZ1o6Oc4UcSa/VtxdtHs+Aw0A=";
|
||||
};
|
||||
|
||||
# FIXME: -dev depends on -doc
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "network-manager-applet";
|
||||
version = "1.26.0";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-aWEbKQZK29Vzlf4+Uanr3h6nlGFfd2kARTorvj2M3f0=";
|
||||
sha256 = "sha256-XANIWB3p5hkYWqdLdH8H9AMSQX45Wv4LKTzJVd8U5Jw=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -90,13 +90,13 @@ in lib.makeExtensible (self: {
|
||||
|
||||
# remember to backport updates to the stable branch!
|
||||
unstable = lib.lowPrio (common rec {
|
||||
version = "2.8";
|
||||
suffix = "pre20220530_${lib.substring 0 7 src.rev}";
|
||||
version = "2.9";
|
||||
suffix = "pre20220610_${lib.substring 0 7 src.rev}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "af23d38019a47e5bb4cd6585a1678b37c957130c";
|
||||
sha256 = "sha256-RH77Y4IhbTofNYlLQSGKLL0fJAG9iHSwRNvMEZ4M0VQ=";
|
||||
rev = "45ebaab66594692035f028796200a6db2b1fedaf";
|
||||
sha256 = "sha256-82M5jKdGUxQBfYj+8nK2SvfVv4Uo0YrPxiuWV/fnvtI=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
@@ -386,7 +386,7 @@ with pkgs;
|
||||
|
||||
gpick = callPackage ../tools/misc/gpick { };
|
||||
|
||||
hobbes = callPackage ../development/tools/hobbes { };
|
||||
hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
|
||||
|
||||
@@ -989,7 +989,7 @@ with pkgs;
|
||||
|
||||
arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
|
||||
boost = boost16x; # checkPhase fails with Boost 1.77
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
adminer = callPackage ../servers/adminer { };
|
||||
@@ -1616,7 +1616,7 @@ with pkgs;
|
||||
|
||||
writefreely = callPackage ../applications/misc/writefreely { };
|
||||
|
||||
iqueue = callPackage ../development/libraries/iqueue { };
|
||||
iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
lifecycled = callPackage ../tools/misc/lifecycled { };
|
||||
|
||||
@@ -2007,7 +2007,7 @@ with pkgs;
|
||||
bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
|
||||
|
||||
bonnie = callPackage ../tools/filesystems/bonnie {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
botamusique = callPackage ../tools/audio/botamusique { };
|
||||
@@ -2128,7 +2128,7 @@ with pkgs;
|
||||
|
||||
dfmt = callPackage ../tools/text/dfmt { };
|
||||
|
||||
diopser = callPackage ../applications/audio/diopser { };
|
||||
diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
diskonaut = callPackage ../tools/misc/diskonaut { };
|
||||
|
||||
@@ -2228,7 +2228,7 @@ with pkgs;
|
||||
|
||||
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
|
||||
|
||||
gammy = qt5.callPackage ../tools/misc/gammy { };
|
||||
gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
gams = callPackage ../tools/misc/gams (config.gams or {});
|
||||
|
||||
@@ -2992,7 +2992,7 @@ with pkgs;
|
||||
|
||||
clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
|
||||
|
||||
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
|
||||
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
|
||||
|
||||
@@ -3319,7 +3319,7 @@ with pkgs;
|
||||
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
|
||||
};
|
||||
|
||||
djv = callPackage ../applications/graphics/djv { };
|
||||
djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
|
||||
|
||||
@@ -4718,7 +4718,7 @@ with pkgs;
|
||||
|
||||
evscript = callPackage ../tools/inputmethods/evscript { };
|
||||
|
||||
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { };
|
||||
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
kime = callPackage ../tools/inputmethods/kime { };
|
||||
|
||||
@@ -4947,7 +4947,7 @@ with pkgs;
|
||||
createrepo_c = callPackage ../tools/package-management/createrepo_c { };
|
||||
|
||||
cromfs = callPackage ../tools/archivers/cromfs {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
cron = callPackage ../tools/system/cron { };
|
||||
@@ -5598,7 +5598,7 @@ with pkgs;
|
||||
|
||||
endlessh-go = callPackage ../servers/endlessh-go { };
|
||||
|
||||
ericw-tools = callPackage ../applications/misc/ericw-tools { };
|
||||
ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
cryfs = callPackage ../tools/filesystems/cryfs { };
|
||||
|
||||
@@ -6630,7 +6630,7 @@ with pkgs;
|
||||
|
||||
robodoc = callPackage ../tools/text/robodoc { };
|
||||
|
||||
ucg = callPackage ../tools/text/ucg { };
|
||||
ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
grive2 = callPackage ../tools/filesystems/grive2 { };
|
||||
|
||||
@@ -6711,9 +6711,8 @@ with pkgs;
|
||||
|
||||
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
|
||||
|
||||
gsmlib = callPackage ../development/libraries/gsmlib {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
gsmlib = callPackage ../development/libraries/gsmlib
|
||||
{ stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; };
|
||||
|
||||
gssdp = callPackage ../development/libraries/gssdp { };
|
||||
|
||||
@@ -7202,7 +7201,7 @@ with pkgs;
|
||||
boost = boost16x;
|
||||
};
|
||||
|
||||
isrcsubmit = callPackage ../tools/audio/isrcsubmit { };
|
||||
isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
isync = callPackage ../tools/networking/isync {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
@@ -8107,7 +8106,7 @@ with pkgs;
|
||||
|
||||
lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { };
|
||||
|
||||
loki = callPackage ../development/libraries/loki { };
|
||||
loki = callPackage ../development/libraries/loki { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
longview = callPackage ../servers/monitoring/longview { };
|
||||
|
||||
@@ -8343,7 +8342,7 @@ with pkgs;
|
||||
|
||||
mkclean = callPackage ../applications/video/mkclean {};
|
||||
|
||||
mkcue = callPackage ../tools/cd-dvd/mkcue { };
|
||||
mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
mkp224o = callPackage ../tools/security/mkp224o { };
|
||||
|
||||
@@ -8897,9 +8896,8 @@ with pkgs;
|
||||
|
||||
ola = callPackage ../applications/misc/ola { };
|
||||
|
||||
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
|
||||
};
|
||||
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor
|
||||
{ stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; };
|
||||
|
||||
ombi = callPackage ../servers/ombi { };
|
||||
|
||||
@@ -8931,7 +8929,7 @@ with pkgs;
|
||||
|
||||
opencryptoki = callPackage ../tools/security/opencryptoki { };
|
||||
|
||||
opendbx = callPackage ../development/libraries/opendbx { };
|
||||
opendbx = callPackage ../development/libraries/opendbx { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
opendht = callPackage ../development/libraries/opendht {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
@@ -9197,12 +9195,10 @@ with pkgs;
|
||||
perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
|
||||
|
||||
percona-xtrabackup = percona-xtrabackup_8_0;
|
||||
percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix {
|
||||
boost = boost159;
|
||||
};
|
||||
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix {
|
||||
boost = boost170;
|
||||
};
|
||||
percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost159; };
|
||||
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost170; };
|
||||
|
||||
pick = callPackage ../tools/misc/pick { };
|
||||
|
||||
@@ -10822,7 +10818,7 @@ with pkgs;
|
||||
|
||||
textadept = callPackage ../applications/editors/textadept/10 { };
|
||||
|
||||
textadept11 = callPackage ../applications/editors/textadept/11 { };
|
||||
textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
texworks = libsForQt5.callPackage ../applications/editors/texworks { };
|
||||
|
||||
@@ -11014,7 +11010,7 @@ with pkgs;
|
||||
|
||||
traceroute = callPackage ../tools/networking/traceroute { };
|
||||
|
||||
tracebox = callPackage ../tools/networking/tracebox { };
|
||||
tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
tracee = callPackage ../tools/security/tracee { };
|
||||
|
||||
@@ -11866,7 +11862,7 @@ with pkgs;
|
||||
|
||||
xwinwrap = callPackage ../tools/X11/xwinwrap {};
|
||||
|
||||
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
|
||||
yafaray-core = callPackage ../tools/graphics/yafaray-core { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
yajsv = callPackage ../tools/misc/yajsv { };
|
||||
|
||||
@@ -12543,6 +12539,8 @@ with pkgs;
|
||||
gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
|
||||
gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
|
||||
|
||||
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv;
|
||||
|
||||
# This is not intended for use in nixpkgs but for providing a faster-running
|
||||
# compiler to nixpkgs users by building gcc with reproducibility-breaking
|
||||
# profile-guided optimizations
|
||||
@@ -13477,9 +13475,8 @@ with pkgs;
|
||||
|
||||
mint = callPackage ../development/compilers/mint { };
|
||||
|
||||
mitscheme = callPackage ../development/compilers/mit-scheme {
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; };
|
||||
};
|
||||
mitscheme = callPackage ../development/compilers/mit-scheme
|
||||
{ stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; };
|
||||
|
||||
mitschemeX11 = mitscheme.override {
|
||||
enableX11 = true;
|
||||
@@ -13556,9 +13553,8 @@ with pkgs;
|
||||
|
||||
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
|
||||
|
||||
obliv-c = callPackage ../development/compilers/obliv-c {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
|
||||
};
|
||||
obliv-c = callPackage ../development/compilers/obliv-c
|
||||
{ stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; };
|
||||
|
||||
ocaml-ng = callPackage ./ocaml-packages.nix { };
|
||||
ocaml = ocamlPackages.ocaml;
|
||||
@@ -13670,7 +13666,7 @@ with pkgs;
|
||||
|
||||
mrustc = callPackage ../development/compilers/mrustc { };
|
||||
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
|
||||
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
|
||||
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
rustPackages_1_60 = rust_1_60.packages.stable;
|
||||
rustPackages = rustPackages_1_60;
|
||||
@@ -14915,10 +14911,7 @@ with pkgs;
|
||||
buildJdk = jdk11_headless;
|
||||
buildJdkName = "java11";
|
||||
runJdk = jdk11_headless;
|
||||
stdenv =
|
||||
if stdenv.cc.isClang then llvmPackages.stdenv
|
||||
else if stdenv.cc.isGNU then gcc10Stdenv
|
||||
else stdenv;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat;
|
||||
bazel_self = bazel_4;
|
||||
};
|
||||
|
||||
@@ -16258,7 +16251,7 @@ with pkgs;
|
||||
|
||||
symfony-cli = callPackage ../development/tools/symfony-cli { };
|
||||
|
||||
swiftshader = callPackage ../development/libraries/swiftshader { };
|
||||
swiftshader = callPackage ../development/libraries/swiftshader { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
systemfd = callPackage ../development/tools/systemfd { };
|
||||
|
||||
@@ -16273,7 +16266,7 @@ with pkgs;
|
||||
|
||||
c3c = callPackage ../development/compilers/c3c { };
|
||||
|
||||
swfmill = callPackage ../tools/video/swfmill { };
|
||||
swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
swftools = callPackage ../tools/video/swftools {
|
||||
stdenv = gccStdenv;
|
||||
@@ -16422,7 +16415,7 @@ with pkgs;
|
||||
|
||||
webdis = callPackage ../development/tools/database/webdis { };
|
||||
|
||||
xc3sprog = callPackage ../development/embedded/xc3sprog { };
|
||||
xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
|
||||
|
||||
@@ -16819,7 +16812,7 @@ with pkgs;
|
||||
classads = callPackage ../development/libraries/classads { };
|
||||
|
||||
clfft = callPackage ../development/libraries/clfft {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
clipp = callPackage ../development/libraries/clipp { };
|
||||
@@ -16895,7 +16888,7 @@ with pkgs;
|
||||
|
||||
uci = callPackage ../development/libraries/uci { };
|
||||
|
||||
uri = callPackage ../development/libraries/uri { };
|
||||
uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
cppcms = callPackage ../development/libraries/cppcms { };
|
||||
|
||||
@@ -16925,7 +16918,7 @@ with pkgs;
|
||||
|
||||
cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { };
|
||||
|
||||
cxxtools = callPackage ../development/libraries/cxxtools { };
|
||||
cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
cwiid = callPackage ../development/libraries/cwiid { };
|
||||
|
||||
@@ -19629,7 +19622,7 @@ with pkgs;
|
||||
|
||||
mosquitto = callPackage ../servers/mqtt/mosquitto { };
|
||||
|
||||
mps = callPackage ../development/libraries/mps { };
|
||||
mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
|
||||
|
||||
@@ -19751,7 +19744,7 @@ with pkgs;
|
||||
|
||||
nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
|
||||
|
||||
non = callPackage ../applications/audio/non { };
|
||||
non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
ntl = callPackage ../development/libraries/ntl { };
|
||||
|
||||
@@ -20858,7 +20851,7 @@ with pkgs;
|
||||
|
||||
tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { };
|
||||
|
||||
tiscamera = callPackage ../os-specific/linux/tiscamera { };
|
||||
tiscamera = callPackage ../os-specific/linux/tiscamera { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
tivodecode = callPackage ../applications/video/tivodecode { };
|
||||
|
||||
@@ -21069,7 +21062,7 @@ with pkgs;
|
||||
|
||||
websocketpp = callPackage ../development/libraries/websocket++ { };
|
||||
|
||||
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { };
|
||||
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; };
|
||||
webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { };
|
||||
# bump when majoring of packages have updated
|
||||
webrtc-audio-processing = webrtc-audio-processing_0_3;
|
||||
@@ -21239,7 +21232,7 @@ with pkgs;
|
||||
|
||||
zlib-ng = callPackage ../development/libraries/zlib-ng { };
|
||||
|
||||
libdynd = callPackage ../development/libraries/libdynd { };
|
||||
libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
zlog = callPackage ../development/libraries/zlog { };
|
||||
|
||||
@@ -22229,7 +22222,7 @@ with pkgs;
|
||||
|
||||
nginx-sso = callPackage ../servers/nginx-sso { };
|
||||
|
||||
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
|
||||
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; };
|
||||
percona-server = percona-server56;
|
||||
|
||||
riak = callPackage ../servers/nosql/riak/2.2.0.nix {
|
||||
@@ -22691,7 +22684,7 @@ with pkgs;
|
||||
|
||||
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
|
||||
|
||||
xqilla = callPackage ../development/tools/xqilla { };
|
||||
xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
xquartz = callPackage ../servers/x11/xquartz { };
|
||||
|
||||
@@ -23595,7 +23588,7 @@ with pkgs;
|
||||
|
||||
pipework = callPackage ../os-specific/linux/pipework { };
|
||||
|
||||
pktgen = callPackage ../os-specific/linux/pktgen { };
|
||||
pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
plymouth = callPackage ../os-specific/linux/plymouth { };
|
||||
|
||||
@@ -25852,7 +25845,7 @@ with pkgs;
|
||||
droopy = python3Packages.callPackage ../applications/networking/droopy { };
|
||||
|
||||
drumgizmo = callPackage ../applications/audio/drumgizmo {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
dsf2flac = callPackage ../applications/audio/dsf2flac { };
|
||||
@@ -26174,9 +26167,9 @@ with pkgs;
|
||||
|
||||
flrig = callPackage ../applications/radio/flrig { };
|
||||
|
||||
fluxus = callPackage ../applications/graphics/fluxus { };
|
||||
fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
flwrap = callPackage ../applications/radio/flwrap { };
|
||||
flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
fluidsynth = callPackage ../applications/audio/fluidsynth {
|
||||
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
|
||||
@@ -26868,7 +26861,7 @@ with pkgs;
|
||||
inherit (gnome2) GConf;
|
||||
};
|
||||
|
||||
gosmore = callPackage ../applications/misc/gosmore { };
|
||||
gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
|
||||
inherit (darwin) IOKit;
|
||||
@@ -27446,7 +27439,7 @@ with pkgs;
|
||||
|
||||
jgmenu = callPackage ../applications/misc/jgmenu { };
|
||||
|
||||
jigdo = callPackage ../applications/misc/jigdo { };
|
||||
jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
|
||||
|
||||
@@ -28063,7 +28056,7 @@ with pkgs;
|
||||
|
||||
mikmod = callPackage ../applications/audio/mikmod { };
|
||||
|
||||
miniaudicle = callPackage ../applications/audio/miniaudicle { };
|
||||
miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
minicom = callPackage ../tools/misc/minicom { };
|
||||
|
||||
@@ -28905,7 +28898,7 @@ with pkgs;
|
||||
|
||||
pianobar = callPackage ../applications/audio/pianobar { };
|
||||
|
||||
pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
|
||||
pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
pianoteq = callPackage ../applications/audio/pianoteq { };
|
||||
|
||||
@@ -29654,7 +29647,7 @@ with pkgs;
|
||||
|
||||
socialscan = with python3.pkgs; toPythonApplication socialscan;
|
||||
|
||||
sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
|
||||
sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
|
||||
|
||||
@@ -30609,11 +30602,8 @@ with pkgs;
|
||||
wxGTK = wxGTK31;
|
||||
};
|
||||
|
||||
wxcam = callPackage ../applications/video/wxcam {
|
||||
inherit (gnome2) libglade;
|
||||
wxGTK = wxGTK28;
|
||||
gtk = gtk2;
|
||||
};
|
||||
wxcam = callPackage ../applications/video/wxcam
|
||||
{ stdenv = gcc10StdenvCompat; inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; };
|
||||
|
||||
xa = callPackage ../development/compilers/xa/xa.nix { };
|
||||
dxa = callPackage ../development/compilers/xa/dxa.nix { };
|
||||
@@ -31195,17 +31185,15 @@ with pkgs;
|
||||
boost = boost17x;
|
||||
};
|
||||
|
||||
oxen = callPackage ../applications/blockchains/oxen {
|
||||
boost = boost17x;
|
||||
};
|
||||
oxen = callPackage ../applications/blockchains/oxen
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost17x; };
|
||||
|
||||
masari = callPackage ../applications/blockchains/masari { boost = boost165; };
|
||||
|
||||
napari = with python3Packages; toPythonApplication napari;
|
||||
|
||||
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet {
|
||||
boost = boost172;
|
||||
};
|
||||
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost172; };
|
||||
|
||||
namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; };
|
||||
namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; };
|
||||
@@ -31572,16 +31560,16 @@ with pkgs;
|
||||
cuyo = callPackage ../games/cuyo { };
|
||||
|
||||
deliantra-server = callPackage ../games/deliantra/server.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
deliantra-arch = callPackage ../games/deliantra/arch.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
deliantra-maps = callPackage ../games/deliantra/maps.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
deliantra-data = callPackage ../games/deliantra/data.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
ddnet = callPackage ../games/ddnet { };
|
||||
@@ -31604,9 +31592,8 @@ with pkgs;
|
||||
|
||||
dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
|
||||
|
||||
dxx-rebirth = callPackage ../games/dxx-rebirth {
|
||||
physfs = physfs_2;
|
||||
};
|
||||
dxx-rebirth = callPackage ../games/dxx-rebirth
|
||||
{ stdenv = gcc10StdenvCompat; physfs = physfs_2; };
|
||||
|
||||
inherit (callPackages ../games/dxx-rebirth/assets.nix { })
|
||||
descent1-assets
|
||||
@@ -31874,7 +31861,7 @@ with pkgs;
|
||||
|
||||
manaplus = callPackage ../games/manaplus { };
|
||||
|
||||
mars = callPackage ../games/mars { };
|
||||
mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
megaglest = callPackage ../games/megaglest { };
|
||||
|
||||
@@ -31973,7 +31960,7 @@ with pkgs;
|
||||
|
||||
openlierox = callPackage ../games/openlierox { };
|
||||
|
||||
openclonk = callPackage ../games/openclonk { };
|
||||
openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
openjk = callPackage ../games/openjk { };
|
||||
|
||||
@@ -32202,10 +32189,8 @@ with pkgs;
|
||||
# You still can override by passing more arguments.
|
||||
space-orbit = callPackage ../games/space-orbit { };
|
||||
|
||||
spring = callPackage ../games/spring {
|
||||
asciidoc = asciidoc-full;
|
||||
boost = boost155;
|
||||
};
|
||||
spring = callPackage ../games/spring
|
||||
{ stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; boost = boost155; };
|
||||
|
||||
springLobby = callPackage ../games/spring/springlobby.nix { };
|
||||
|
||||
@@ -32245,12 +32230,8 @@ with pkgs;
|
||||
|
||||
stt = callPackage ../tools/audio/stt { };
|
||||
|
||||
stuntrally = callPackage ../games/stuntrally {
|
||||
ogre = ogre1_9;
|
||||
mygui = mygui.override {
|
||||
withOgre = true;
|
||||
};
|
||||
};
|
||||
stuntrally = callPackage ../games/stuntrally
|
||||
{ stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
|
||||
|
||||
superTux = callPackage ../games/supertux { };
|
||||
|
||||
@@ -32700,23 +32681,23 @@ with pkgs;
|
||||
};
|
||||
|
||||
bpp-core = callPackage ../development/libraries/science/biology/bpp-core {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
bppsuite = callPackage ../applications/science/biology/bppsuite {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
cd-hit = callPackage ../applications/science/biology/cd-hit {
|
||||
@@ -32874,7 +32855,7 @@ with pkgs;
|
||||
|
||||
star = callPackage ../applications/science/biology/star { };
|
||||
|
||||
strelka = callPackage ../applications/science/biology/strelka { };
|
||||
strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
inherit (callPackages ../applications/science/biology/sumatools {})
|
||||
sumalibs
|
||||
@@ -32943,7 +32924,7 @@ with pkgs;
|
||||
|
||||
flintqs = callPackage ../development/libraries/science/math/flintqs { };
|
||||
|
||||
getdp = callPackage ../applications/science/math/getdp { };
|
||||
getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
gurobi = callPackage ../applications/science/math/gurobi { };
|
||||
|
||||
@@ -33097,7 +33078,7 @@ with pkgs;
|
||||
|
||||
### SCIENCE/MOLECULAR-DYNAMICS
|
||||
|
||||
dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { };
|
||||
dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
lammps = callPackage ../applications/science/molecular-dynamics/lammps {
|
||||
fftw = fftw;
|
||||
@@ -33193,7 +33174,7 @@ with pkgs;
|
||||
alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
|
||||
|
||||
aspino = callPackage ../applications/science/logic/aspino {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
beluga = callPackage ../applications/science/logic/beluga {};
|
||||
@@ -34036,7 +34017,7 @@ with pkgs;
|
||||
|
||||
utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
|
||||
|
||||
idsk = callPackage ../tools/filesystems/idsk { };
|
||||
idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
colima = callPackage ../applications/virtualization/colima { };
|
||||
|
||||
@@ -34500,7 +34481,7 @@ with pkgs;
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
|
||||
rss-glx = callPackage ../misc/screensavers/rss-glx { };
|
||||
rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
run-scaled = callPackage ../tools/X11/run-scaled { };
|
||||
|
||||
@@ -35143,9 +35124,8 @@ with pkgs;
|
||||
|
||||
openring = callPackage ../applications/misc/openring { };
|
||||
|
||||
openvino = callPackage ../development/libraries/openvino {
|
||||
python = python3;
|
||||
};
|
||||
openvino = callPackage ../development/libraries/openvino
|
||||
{ stdenv = gcc10StdenvCompat; python = python3; };
|
||||
|
||||
phonetisaurus = callPackage ../development/libraries/phonetisaurus {
|
||||
# https://github.com/AdolfVonKleist/Phonetisaurus/issues/70
|
||||
|
||||
Reference in New Issue
Block a user