colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-08-23 00:01:50 +00:00 committed by GitHub
commit 84387348d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
63 changed files with 319 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/image/amend-repart-definitions.py
View File

@ -53,7 +53,7 @@ def add_closure_to_definition(
source = Path(line.strip())
target = str(source.relative_to("/nix/store/"))
target = f":{target}" if strip_nix_store_prefix else ""
target = f":/{target}" if strip_nix_store_prefix else ""
copy_files_lines.append(f"CopyFiles={source}{target}\n")
@ -102,7 +102,7 @@ def main() -> None:
add_contents_to_definition(definition, contents)
closure = config.get("closure")
strip_nix_store_prefix = config.get("stripStorePaths")
strip_nix_store_prefix = config.get("stripNixStorePrefix")
add_closure_to_definition(definition, closure, strip_nix_store_prefix)
print(target_dir.absolute())

32
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -2412,6 +2412,38 @@ let
};
};
ms-python.black-formatter = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "black-formatter";
publisher = "ms-python";
version = "2023.4.1";
sha256 = "sha256-IJaLke0WF1rlKTiuwJHAXDQB1SS39AoQhc4iyqqlTyY=";
};
meta = with lib; {
description = "Formatter extension for Visual Studio Code using black";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter";
homepage = "https://github.com/microsoft/vscode-black-formatter";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
};
};
ms-python.isort = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "isort";
publisher = "ms-python";
version = "2023.10.1";
sha256 = "sha256-NRsS+mp0pIhGZiqxAMXNZ7SwLno9Q8pj+RS1WB92HzU=";
};
meta = with lib; {
description = "Import sorting extension for Visual Studio Code using isort";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.isort";
homepage = "https://github.com/microsoft/vscode-isort";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
};
};
ms-python.python = callPackage ./ms-python.python { };
ms-python.vscode-pylance = buildVscodeMarketplaceExtension {

6
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -23,7 +23,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.1.3035.204";
version = "6.1.3035.302";
suffix = {
aarch64-linux = "arm64";
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-i2eIm4AF7avjy3KSUvoOOKWw7Q+BatozGpy/yyX4Esg=";
x86_64-linux = "sha256-TLuTYXp6EdQDBWPM1TEXwhdxWWMSPKIi5fW+SGUVdRo=";
aarch64-linux = "sha256-HWnHuLcJrV4yYt/l0iLl0N2p9v7r5RwQod1s0op52Z4=";
x86_64-linux = "sha256-NPmiatlGK+8GJHwDXyOZ+J1PSN7Oj8sAKfm6r1usI1E=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

33
pkgs/applications/networking/cluster/kfctl/default.nix
View File

@ -1,33 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "kfctl";
version = "1.2.0";
src = fetchFromGitHub {
owner = "kubeflow";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FY7o4QULobLY1djfcc2l6awE/v2stN7cc2lffMkjoPc=";
};
vendorSha256 = null; #vendorSha256 = "";
subPackages = [ "cmd/kfctl" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd eksctl \
--bash <($out/bin/kfctl completion bash) \
--zsh <($out/bin/kfctl completion zsh)
'';
meta = with lib; {
description = "A CLI for deploying and managing Kubeflow";
homepage = "https://github.com/kubeflow/kfctl";
license = licenses.asl20;
maintainers = with maintainers; [ mvnetbiz ];
broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
};
}

6
pkgs/applications/networking/dnscontrol/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
version = "4.1.1";
version = "4.2.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gdR9Dfzvf/OR+SDFLzN5GMNyrkuqm6z7cF8QR/L+Bh8=";
sha256 = "sha256-woiFCirM2psmwcKGgQngOJuYZDI2t81xkSzVi4svtXs=";
};
vendorHash = "sha256-DURAWzJDkI2Q/3d6FFx+EbMFkUr6evcbtXZzkh1HG1Y=";
vendorHash = "sha256-3xT5WPBcEclXad8zBA+T7/M6fDmfMWljV8NuxvtvTsA=";
subPackages = [ "." ];

4
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
version = "0.11.11";
version = "0.12.0";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
hash = "sha256-IKKWJBe6A3TVWIRTDyWbfRYMwgRNhSqSJK0ZRZNCVkA=";
hash = "sha256-PMLc0o+zwtdtY2p5z5xwdcawNKddenr64vmC+dxrw+Y=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

6
pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "twitch-tui";
version = "2.4.1";
version = "2.5.1";
src = fetchFromGitHub {
owner = "Xithrius";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-+dKS9lp5M8vh0V4VGyWAozozdsyCPpCZR4CQK5s51Ds=";
hash = "sha256-oqsLqmyLrvb8u9cj68OemUfunbP98/BZjmoGl1Mctrk=";
};
cargoHash = "sha256-CzrOsLUTfZ2uEIj/AHFmdfZniwlQ6fIkL2pbBHF8YkU=";
cargoHash = "sha256-DEHMF6sTH3BF8lqOV5G4F3+Tsafrhzr0YLqSgV3gq9I=";
nativeBuildInputs = [
pkg-config

4
pkgs/applications/networking/nextcloud-client/default.nix
View File

@ -25,7 +25,7 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.9.2";
version = "3.9.3";
outputs = [ "out" "dev" ];
@ -33,7 +33,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-QtZy5ccr55u8bQVBCFRNu/HJiYtNJX9BgtSV700QX0g=";
sha256 = "sha256-9DfQZ3AFyiUKwt8IqAgjQlQ2XJtwkLEtPM5+VH+x/6c=";
};
patches = [

11
pkgs/applications/networking/sniffers/sngrep/default.nix
View File

@ -3,6 +3,7 @@
, autoconf
, automake
, fetchFromGitHub
, fetchpatch
, libpcap
, ncurses
, openssl
@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-gFba2wOU4GwpOZTo5A2QpBgnC6OgDJEeyaPGHbA+7tA=";
};
patches = [
(fetchpatch {
name = "CVE-2023-36192.patch";
url = "https://github.com/irontec/sngrep/commit/ad1daf15c8387bfbb48097c25197bf330d2d98fc.patch";
hash = "sha256-g8fxvxi3d7jmZEKTbxqw29hJbm/ShsKKxstsOUGxTug=";
})
];
nativeBuildInputs = [
autoconf
automake
@ -44,6 +53,8 @@ stdenv.mkDerivation rec {
./bootstrap.sh
'';
doCheck = true;
meta = with lib; {
description = "A tool for displaying SIP calls message flows from terminal";
homepage = "https://github.com/irontec/sngrep";

4
pkgs/applications/radio/qradiolink/default.nix
View File

@ -23,13 +23,13 @@
gnuradio3_8.pkgs.mkDerivation rec {
pname = "qradiolink";
version = "0.8.9-1";
version = "0.8.10-1";
src = fetchFromGitHub {
owner = "qradiolink";
repo = "qradiolink";
rev = version;
sha256 = "sha256-yY9sdLFaG0fX/4obImxVAyJk13RklYjX99Ch9hgzTe8=";
sha256 = "sha256-DOf5Ct8a9EGpO3YLef+Hw87m5tCVqD30weVOeis9agI=";
};
preBuild = ''

4
pkgs/applications/version-management/git-privacy/default.nix
View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "git-privacy";
version = "2.1.0";
version = "2.3.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "EMPRI-DEVOPS";
repo = pname;
rev = "v${version}";
sha256 = "0hfy43fip1l81672xfwqrz1jryzkjy7h9f2lyikxgibibil0p444";
hash = "sha256-b2RkRL8/mZwqc3xCs+oltzualhQtp/7F9POlLlT3UUU=";
};
propagatedBuildInputs = with python3.pkgs; [

4
pkgs/applications/virtualization/crun/default.nix
View File

@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.8.6";
version = "1.8.7";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
hash = "sha256-qPbJ8h/s4E7EmNlgBdrNZ0AW0D/N7PkK57C1cXjuM9U=";
hash = "sha256-+EHkbAltoYzlDIgMbH3ofhpBLJhv5lq72u7Hh7cpU/M=";
fetchSubmodules = true;
};

20
pkgs/development/compilers/llvm/15/libcxx/default.nix
View File

@ -2,7 +2,7 @@
, monorepoSrc, runCommand
, cmake, ninja, python3, fixDarwinDylibNames, version
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
, libcxxabi, libcxxrt
, libcxxabi, libcxxrt, libunwind
, enableShared ? !stdenv.hostPlatform.isStatic
# If headersOnly is true, the resulting package would only include the headers.
@ -62,7 +62,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja python3 ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = lib.optionals (!headersOnly) [ cxxabi ];
buildInputs =
lib.optionals (!headersOnly) [ cxxabi ]
++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ];
cmakeFlags = let
# See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string
@ -75,8 +77,18 @@ stdenv.mkDerivation rec {
"-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}"
] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1"
++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
++ lib.optionals stdenv.hostPlatform.isWasm [
++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLIBCXX_USE_COMPILER_RT=ON"
# (Backport fix from 16, which has LIBCXX_ADDITIONAL_LIBRARIES, but 15
# does not appear to)
# There's precedent for this in llvm-project/libcxx/cmake/caches.
# In a monorepo build you might do the following in the libcxxabi build:
# -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwind
# -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On
# libcxx appears to require unwind and doesn't pull it in via other means.
# "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind"
"-DCMAKE_SHARED_LINKER_FLAGS=-lunwind"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXX_ENABLE_THREADS=OFF"
"-DLIBCXX_ENABLE_FILESYSTEM=OFF"
"-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

7
pkgs/development/compilers/llvm/15/libcxxabi/default.nix
View File

@ -68,6 +68,13 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) ||
(stdenv.hostPlatform.isDarwin && enableShared)) [
# libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib,
# but that does not appear to be the case for example when building
# pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).
"-DCMAKE_EXE_LINKER_FLAGS=-nostdlib"
"-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXXABI_ENABLE_THREADS=OFF"
"-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"

5
pkgs/development/compilers/llvm/15/libunwind/default.nix
View File

@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
cd ../runtimes
'';
postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) ''
# libcxxabi wants to link to libunwind_shared.so (?).
ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so
'';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ninja python3 ];

19
pkgs/development/compilers/llvm/16/compiler-rt/default.nix
View File

@ -32,9 +32,16 @@ stdenv.mkDerivation {
++ lib.optional stdenv.isDarwin xcbuild.xcrun;
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
env.NIX_CFLAGS_COMPILE = toString [
env.NIX_CFLAGS_COMPILE = toString ([
"-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
];
] ++ lib.optionals (!haveLibc) [
# The compiler got stricter about this, and there is a usellvm patch below
# which patches out the assert include causing an implicit definition of
# assert. It would be nicer to understand why compiler-rt thinks it should
# be able to #include <assert.h> in the first place; perhaps it's in the
# wrong, or perhaps there is a way to provide an assert.h.
"-Wno-error=implicit-function-declaration"
]);
cmakeFlags = [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
@ -102,7 +109,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/config-ix.cmake \
--replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
'' + lib.optionalString (useLLVM) ''
'' + lib.optionalString (useLLVM && !haveLibc) ''
substituteInPlace lib/builtins/int_util.c \
--replace "#include <stdlib.h>" ""
substituteInPlace lib/builtins/clear_cache.c \
@ -117,6 +124,12 @@ stdenv.mkDerivation {
'' + lib.optionalString (useLLVM) ''
ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
# Note the history of crt{begin,end}S in previous versions of llvm in nixpkg:
# The presence of crtbegin_shared has been added and removed; it's possible
# people have added/removed it to get it working on their platforms.
# Try each in turn for now.
ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbeginS.o
ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtendS.o
ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
'' + lib.optionalString doFakeLibgcc ''

8
pkgs/development/compilers/llvm/16/default.nix
View File

@ -254,6 +254,14 @@ in let
[ "-rtlib=compiler-rt"
"-Wno-unused-command-line-argument"
"-B${targetLlvmLibraries.compiler-rt}/lib"
# Combat "__cxxabi_config.h not found". Maybe this could be fixed by
# copying these headers into libcxx? Note that building libcxx
# outside of monorepo isn't supported anymore, might be related to
# https://github.com/llvm/llvm-project/issues/55632
# ("16.0.3 libcxx, libcxxabi: circular build dependencies")
# Looks like the machinery changed in https://reviews.llvm.org/D120727.
"-I${lib.getDev targetLlvmLibraries.libcxx.cxxabi}/include/c++/v1"
]
++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind"
++ lib.optional

19
pkgs/development/compilers/llvm/16/libcxx/default.nix
View File

@ -2,7 +2,7 @@
, monorepoSrc, runCommand
, cmake, ninja, python3, fixDarwinDylibNames, version
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
, libcxxabi, libcxxrt
, libcxxabi, libcxxrt, libunwind
, enableShared ? !stdenv.hostPlatform.isStatic
# If headersOnly is true, the resulting package would only include the headers.
@ -47,8 +47,6 @@ stdenv.mkDerivation rec {
patches = [
./gnu-install-dirs.patch
] ++ lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
];
postPatch = ''
@ -62,7 +60,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja python3 ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = lib.optionals (!headersOnly) [ cxxabi ];
buildInputs =
lib.optionals (!headersOnly) [ cxxabi ]
++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ];
cmakeFlags = let
# See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string
@ -75,8 +75,15 @@ stdenv.mkDerivation rec {
"-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}"
] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1"
++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
++ lib.optionals stdenv.hostPlatform.isWasm [
++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLIBCXX_USE_COMPILER_RT=ON"
# There's precedent for this in llvm-project/libcxx/cmake/caches.
# In a monorepo build you might do the following in the libcxxabi build:
# -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwinder
# -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On
# libcxx appears to require unwind and doesn't pull it in via other means.
"-DLIBCXX_ADDITIONAL_LIBRARIES=unwind"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXX_ENABLE_THREADS=OFF"
"-DLIBCXX_ENABLE_FILESYSTEM=OFF"
"-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

7
pkgs/development/compilers/llvm/16/libcxxabi/default.nix
View File

@ -68,6 +68,13 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) ||
(stdenv.hostPlatform.isDarwin && enableShared)) [
# libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib,
# but that does not appear to be the case for example when building
# pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).
"-DCMAKE_EXE_LINKER_FLAGS=-nostdlib"
"-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXXABI_ENABLE_THREADS=OFF"
"-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"

5
pkgs/development/compilers/llvm/16/libunwind/default.nix
View File

@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
cd ../runtimes
'';
postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) ''
# libcxxabi wants to link to libunwind_shared.so (?).
ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so
'';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ninja python3 ];

13
pkgs/development/compilers/llvm/git/default.nix
View File

@ -313,6 +313,19 @@ in let
# what stdenv we use here, as long as CMake is happy.
cxx-headers = callPackage ./libcxx {
inherit llvm_meta;
# Note that if we use the regular stdenv here we'll get cycle errors
# when attempting to use this compiler in the stdenv.
#
# The final stdenv pulls `cxx-headers` from the package set where
# hostPlatform *is* the target platform which means that `stdenv` at
# that point attempts to use this toolchain.
#
# So, we use `stdenv_` (the stdenv containing `clang` from this package
# set, defined below) to sidestep this issue.
#
# Because we only use `cxx-headers` in `libcxxabi` (which depends on the
# clang stdenv _anyways_), this is okay.
stdenv = stdenv_;
headersOnly = true;
};

21
pkgs/development/compilers/llvm/git/libcxx/default.nix
View File

@ -2,7 +2,7 @@
, monorepoSrc, runCommand
, cmake, ninja, python3, fixDarwinDylibNames, version
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
, libcxxabi, libcxxrt
, libcxxabi, libcxxrt, libunwind
, enableShared ? !stdenv.hostPlatform.isStatic
# If headersOnly is true, the resulting package would only include the headers.
@ -62,7 +62,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja python3 ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = lib.optionals (!headersOnly) [ cxxabi ];
buildInputs =
lib.optionals (!headersOnly) [ cxxabi ]
++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ];
cmakeFlags = let
# See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string
@ -75,8 +78,18 @@ stdenv.mkDerivation rec {
"-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}"
] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1"
++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
++ lib.optionals stdenv.hostPlatform.isWasm [
++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLIBCXX_USE_COMPILER_RT=ON"
# (Backport fix from 16, which has LIBCXX_ADDITIONAL_LIBRARIES, but 15
# does not appear to)
# There's precedent for this in llvm-project/libcxx/cmake/caches.
# In a monorepo build you might do the following in the libcxxabi build:
# -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwinder
# -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On
# libcxx appears to require unwind and doesn't pull it in via other means.
# "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind"
"-DCMAKE_SHARED_LINKER_FLAGS=-lunwind"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXX_ENABLE_THREADS=OFF"
"-DLIBCXX_ENABLE_FILESYSTEM=OFF"
"-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

7
pkgs/development/compilers/llvm/git/libcxxabi/default.nix
View File

@ -68,6 +68,13 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) ||
(stdenv.hostPlatform.isDarwin && enableShared)) [
# libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib,
# but that does not appear to be the case for example when building
# pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).
"-DCMAKE_EXE_LINKER_FLAGS=-nostdlib"
"-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXXABI_ENABLE_THREADS=OFF"
"-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"

5
pkgs/development/compilers/llvm/git/libunwind/default.nix
View File

@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
cd ../runtimes
'';
postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) ''
# libcxxabi wants to link to libunwind_shared.so (?).
ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so
'';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ninja python3 ];

4
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
, libarchive, db, pcre, libedit, libossp_uuid, libxcrypt,libXpm
, libarchive, db, pcre2, libedit, libossp_uuid, libxcrypt,libXpm
, libSM, libXt, freetype, pkg-config, fontconfig
, cmake, libyaml, Security
, libjpeg, libX11, libXext, libXft, libXinerama
@ -59,7 +59,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ gmp readline openssl
libarchive libyaml db pcre libedit libossp_uuid libxcrypt
libarchive libyaml db pcre2 libedit libossp_uuid libxcrypt
zlib ]
++ lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
++ extraLibraries

4
pkgs/development/libraries/grantlee/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "grantlee";
version = "5.2.0";
version = "5.3.1";
src = fetchFromGitHub {
owner = "steveire";
repo = pname;
rev = "v${version}";
hash = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk=";
hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY=";
};
nativeBuildInputs = [ cmake wrapQtAppsHook ];

40
pkgs/development/libraries/science/math/nccl/default.nix
View File

@ -2,24 +2,25 @@
, backendStdenv
, fetchFromGitHub
, which
, cudaPackages ? { }
, addOpenGLRunpath
, autoAddOpenGLRunpathHook
, cuda_cccl
, cuda_cudart
, cuda_nvcc
, cudaFlags
, cudaVersion
}:
with cudaPackages;
let
# Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86"
gencode = lib.concatStringsSep " " cudaFlags.gencode;
in
backendStdenv.mkDerivation rec {
name = "nccl-${version}-cuda-${cudaPackages.cudaMajorVersion}";
backendStdenv.mkDerivation (finalAttrs: {
name = "nccl-${finalAttrs.version}-cuda-${cudaVersion}";
version = "2.16.5-1";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nccl";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU=";
};
@ -27,13 +28,18 @@ backendStdenv.mkDerivation rec {
nativeBuildInputs = [
which
addOpenGLRunpath
autoAddOpenGLRunpathHook
cuda_nvcc
];
buildInputs = [
cuda_cudart
] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0.0") [
]
# NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons
# against other version, like below, it's important that we use the same format. Otherwise,
# we'll get incorrect results.
# For example, lib.versionAtLeast "12.0" "12.0.0" == false.
++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [
cuda_cccl
];
@ -46,27 +52,19 @@ backendStdenv.mkDerivation rec {
makeFlags = [
"CUDA_HOME=${cuda_nvcc}"
"CUDA_LIB=${cuda_cudart}/lib64"
"CUDA_INC=${cuda_cudart}/include"
"CUDA_LIB=${lib.getLib cuda_cudart}/lib"
"CUDA_INC=${lib.getDev cuda_cudart}/include"
"PREFIX=$(out)"
];
postFixup = ''
moveToOutput lib/libnccl_static.a $dev
# Set RUNPATH so that libnvidia-ml in /run/opengl-driver(-32)/lib can be found.
# See the explanation in addOpenGLRunpath.
addOpenGLRunpath $out/lib/lib*.so
'';
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ];
enableParallelBuilding = true;
passthru = {
inherit cudaPackages;
};
meta = with lib; {
description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs";
homepage = "https://developer.nvidia.com/nccl";
@ -74,4 +72,4 @@ backendStdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ mdaiter orivej ];
};
}
})

4
pkgs/development/python-modules/androidtvremote2/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "androidtvremote2";
version = "0.0.13";
version = "0.0.14";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tronikos";
repo = "androidtvremote2";
rev = "refs/tags/v${version}";
hash = "sha256-+9VVUIvM//Fxv1a/+PAKWSQE8/TgBZzeTisgMqj6KPU=";
hash = "sha256-m53TlNrrCjA4CqvR02Yph7Gr5Dt17VJFBX6MC3arWOI=";
};
nativeBuildInputs = [

7
pkgs/development/python-modules/azure-mgmt-storage/default.nix
View File

@ -8,15 +8,14 @@
buildPythonPackage rec {
pname = "azure-mgmt-storage";
version = "21.0.0";
version = "21.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c=";
hash = "sha256-1tPA6RfJiLye0Eckd9PvP5CIYAnrHZenEZRPg3VjAWI=";
};
propagatedBuildInputs = [
@ -32,7 +31,7 @@ buildPythonPackage rec {
"azure.mgmt.storage"
];
# has no tests
# Module has no tests
doCheck = false;
meta = with lib; {

4
pkgs/development/python-modules/boschshcpy/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "boschshcpy";
version = "0.2.66";
version = "0.2.67";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tschamm";
repo = pname;
rev = version;
hash = "sha256-0mj1+sbNOE7PBFj99qfqgeYipaRxkQTUIPTPpXueczo=";
hash = "sha256-M0LyEKJUcamv0PcflVI97zrXAoe1iV5sJ/oh60bMo6c=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/bthome-ble/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "3.1.0";
version = "3.1.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "bthome-ble";
rev = "refs/tags/v${version}";
hash = "sha256-CcLb+2UOLKwfBw3E51LJUZmLqpBw85nLXl1J/oFfEVs=";
hash = "sha256-fQIvOa9/Bqo4BN6LJz8COHo6n2m4XogVYCMdAUvDZUQ=";
};
nativeBuildInputs = [

18
pkgs/development/python-modules/fritzconnection/default.nix
View File

@ -4,26 +4,33 @@
, fetchFromGitHub
, pytestCheckHook
, requests
, segno
}:
buildPythonPackage rec {
pname = "fritzconnection";
version = "1.12.2";
version = "1.13.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "kbr";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-e+w3ce6KdvbYzH48XPEQTiBgtjbKWNdQj8ie4yw0rzE=";
hash = "sha256-FTg5LHjti6Srmz1LcPU0bepNzn2tpmdSBM3Y2BzZEms=";
};
propagatedBuildInputs = [
requests
];
passthru.optional-dependencies = {
qr = [
segno
];
};
nativeCheckInputs = [
pytestCheckHook
];
@ -36,6 +43,11 @@ buildPythonPackage rec {
"fritzconnection"
];
disabledTestPaths = [
# Functional tests require network access
"fritzconnection/tests/test_functional.py"
];
meta = with lib; {
description = "Python module to communicate with the AVM Fritz!Box";
homepage = "https://github.com/kbr/fritzconnection";

10
pkgs/development/python-modules/marshmallow/default.nix
View File

@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "marshmallow";
version = "3.19.0";
version = "3.20.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "marshmallow-code";
repo = pname;
rev = version;
hash = "sha256-b1brLHM48t45bwUXk7QreLLmvTzU0sX7Uoc1ZAgGkrE=";
rev = "refs/tags/${version}";
hash = "sha256-sPYiup7ontnubtBxv+rIT0up4IHPJNCUlH9J4FlHsss=";
};
propagatedBuildInputs = [
@ -37,9 +37,9 @@ buildPythonPackage rec {
];
meta = with lib; {
changelog = "https://github.com/marshmallow-code/marshmallow/blob/${src.rev}/CHANGELOG.rst";
description = "Library for converting complex objects to and from simple Python datatypes";
homepage = "https://github.com/marshmallow-code/marshmallow";
changelog = "https://github.com/marshmallow-code/marshmallow/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ cript0nauta ];
};

6
pkgs/development/python-modules/pyfibaro/default.nix
View File

@ -6,11 +6,12 @@
, requests
, requests-mock
, setuptools
, wheel
}:
buildPythonPackage rec {
pname = "pyfibaro";
version = "0.7.2";
version = "0.7.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -19,11 +20,12 @@ buildPythonPackage rec {
owner = "rappenze";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-dAC+jW+Ky+uPsgBXpp81+bxytWYeZbd+zWzEXkmM198=";
hash = "sha256-pCj69lLcoNTyZRe6SVkFpPK2Ex8927WzAJ5OCot9xP4=";
};
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyipp/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyipp";
version = "0.14.3";
version = "0.14.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "ctalkington";
repo = "python-ipp";
rev = version;
hash = "sha256-WbrAvIdFUPzSxGjIPzNny0V1W8S774vyREgylenJp24=";
hash = "sha256-xE0fdT+Ffdf4iOHWZzRa7YWtHt92lFdA/sbwjblMR40=";
};
postPatch = ''

6
pkgs/development/tools/dprint/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.40.0";
version = "0.40.2";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-leneOdV65aAUGRdVFpPuVnCmu3VmVzZXxOLJ5vspVB8=";
sha256 = "sha256-kkGBSyLirHlJOzNh8GtY6k8kxpgouqHRQQEM/eDU7TA=";
};
cargoHash = "sha256-C0cgN7G+zQZr+V/iPHh6HXV8DnPaE0bWkbJmbfIMwgk=";
cargoHash = "sha256-jImnU9ksYYmQOoaLBH+lMdoAsgo9ZFlu0tng61wrXXw=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

6
pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
View File

@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-bisect-rustc";
version = "0.6.6";
version = "0.6.7";
src = fetchFromGitHub {
owner = "rust-lang";
repo = pname;
rev = "v${version}";
hash = "sha256-i/MZslGbv72MZmd31SQFc2QdDRigs8edyN2/T5V5r4k=";
hash = "sha256-1edBGjnVsMNoP06HAEERQJ6HCkk0dRKlnt1b8GnJWsY=";
};
patches =
@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
Security
];
cargoHash = "sha256-dnR0V2MvW4Z3jtsjXSboCRFNb22fDGu01fC40N2Deho=";
cargoHash = "sha256-HzqGSuobGuIuLwoAPQJ1d6xUO2VJ0rcjfOYz2wdIbCk=";
checkFlags = [
"--skip test_github" # requires internet

6
pkgs/development/tools/rust/cargo-chef/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-chef";
version = "0.1.61";
version = "0.1.62";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-O3q0gfVnFMgcwWGfRgdGOwU6fauRN2qPkyTe72p3zS4=";
sha256 = "sha256-ZewsR6MgBf8wdqBIrYAuprmqthhbEA/WDShp9H3jfDs=";
};
cargoHash = "sha256-A22x2s5tHf9M6UbFHwmVNgO2qe65io/GysF1+ZE8NXM=";
cargoHash = "sha256-UHUNoI9QqHzgYIuKlj0giWfFgS+F3eUC/wuAXgwH2xQ=";
meta = with lib; {
description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching";

6
pkgs/development/tools/rust/cargo-llvm-lines/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-lines";
version = "0.4.32";
version = "0.4.33";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
hash = "sha256-uoIfB+jkLamrsDRMaxExQC1syN6VeTJhfei8FgikTCE=";
hash = "sha256-EgUnVnSELdiRU63saQ0o2IE4vs6tcQ/AfE4aMyegJBk=";
};
cargoHash = "sha256-SXiFkPm/2C5dABKPZBq3XXdElZemZN5E2vQTceATyE0=";
cargoHash = "sha256-zq95Dzcbz08/8lumAyTfSzCEHCWWlp8Fw7R6fnfTOrk=";
meta = with lib; {
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";

13
pkgs/development/tools/rust/cargo-rr/default.nix
View File

@ -1,29 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
, gitUpdater
, common-updater-scripts
, nix-update-script
, makeWrapper
, rr
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-rr";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "danielzfranklin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lQS+bp1u79iO8WGrkZSFEuonr1eYjxIQYhUvM/kBao4";
sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo=";
};
cargoSha256 = "sha256-PdKqWMxTtBJbNqITs3IjNcpijXy6MHitEY4jDp4jZro=";
cargoSha256 = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM=";
passthru = {
updateScript = gitUpdater {
rev-prefix = "v";
};
updateScript = nix-update-script { };
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/os-specific/linux/rdma-core/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rdma-core";
version = "46.1";
version = "47.0";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${finalAttrs.version}";
hash = "sha256-pVPWoLnWCGP+CZtG5bnOKUtjiuOa6Qic9wlGeY68w/8=";
hash = "sha256-R+qgHDu9GRwT5ic1DCDlYe1Xb4hqi8pgitKq9iBBQNQ=";
};
strictDeps = true;

4
pkgs/servers/computing/slurm/default.nix
View File

@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "23.02.3.1";
version = "23.02.4.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-YMm8a7uyZpPEuWQcgddX+0Me+ndgbYoDnC+sbmN/Hh8=";
sha256 = "sha256-sNZqC6F7Q05AqkKVVUG4mCO3JXRjVZBppt3VgRHf5+o=";
};
outputs = [ "out" "dev" ];

4
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -17,11 +17,11 @@ lua = luajitPackages;
unwrapped = stdenv.mkDerivation rec {
pname = "knot-resolver";
version = "5.6.0";
version = "5.7.0";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
sha256 = "0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7";
sha256 = "383ef6db1cccabd2dd788ea9385f05e98a2bafdfeb7f0eda57ff9d572f4fad71";
};
outputs = [ "out" "dev" ];

8
pkgs/servers/home-assistant/component-packages.nix
View File

@ -1346,13 +1346,15 @@
psutil-home-assistant
sqlalchemy
xmltodict
]; # missing inputs: fritzconnection.optional-dependencies.qr
]
++ fritzconnection.optional-dependencies.qr;
"fritzbox" = ps: with ps; [
pyfritzhome
];
"fritzbox_callmonitor" = ps: with ps; [
fritzconnection
]; # missing inputs: fritzconnection.optional-dependencies.qr
]
++ fritzconnection.optional-dependencies.qr;
"fronius" = ps: with ps; [
pyfronius
];
@ -5032,7 +5034,9 @@
"freebox"
"freedns"
"freedompro"
"fritz"
"fritzbox"
"fritzbox_callmonitor"
"fronius"
"frontend"
"frontier_silicon"

4
pkgs/servers/home-assistant/stubs.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.8.2";
version = "2023.8.3";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-uoDpwXJfZC26oesMTv1mjO7Ib0dKamTQdIYyLJnrERk=";
hash = "sha256-odZ0rKydFtj2bwNrP3KsE5xxFLAssYMoaEe+sBMIeYI=";
};
nativeBuildInputs = [

2
pkgs/servers/klipper/klipper-genconf.nix
View File

@ -2,12 +2,10 @@
, klipper
, python3
, gnumake
, pkgsCross
}: writeShellApplication {
name = "klipper-genconf";
runtimeInputs = [
python3
pkgsCross.avr.stdenv.cc
gnumake
];
text = ''

6
pkgs/servers/nitter/default.nix
View File

@ -21,13 +21,13 @@
buildNimPackage rec {
pname = "nitter";
version = "unstable-2023-07-21";
version = "unstable-2023-08-08";
src = fetchFromGitHub {
owner = "zedeus";
repo = "nitter";
rev = "cc5841df308506356d329662d0f0c2ec4713a35c";
hash = "sha256-QuWLoKy7suUCTYK79ghdf3o/FGFIDNyN1Iu69DFp6wg=";
rev = "d7ca353a55ea3440a2ec1f09155951210a374cc7";
hash = "sha256-nlpUzbMkDzDk1n4X+9Wk7+qQk+KOfs5ID6euIfHBoa8=";
};
patches = [

6
pkgs/tools/admin/drawterm/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation {
pname = "drawterm";
version = "unstable-2023-06-27";
version = "unstable-2023-08-22";
src = fetchFrom9Front {
owner = "plan9front";
repo = "drawterm";
rev = "36debf46ac184a22c6936345d22e4cfad995948c";
hash = "sha256-ebqw1jqeRC0FWeUIO/HaEovuwzU6+B48TjZbVJXByvA=";
rev = "c91c6fac9d725716ca6ecc3002053f941137f24f";
hash = "sha256-oGcKRx1tP2jeshHhaCHPRKmwKQ3WPYK1tHGGt1/3oDU=";
};
enableParallelBuilding = true;

4
pkgs/tools/backup/gyb/default.nix
View File

@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "gyb";
version = "1.72";
version = "1.74";
format = "other";
src = fetchFromGitHub {
owner = "GAM-team";
repo = "got-your-back";
rev = "refs/tags/v${version}";
sha256 = "sha256-75ZU1qNFdiX9Uhb+tKN0438iHKvY4fuFVGvcgyFFgJo=";
sha256 = "sha256-JUI9BIDg7Z6z5ZtwBMsgTbYXp9w0jd1DKFAa1XjeEtQ=";
};
propagatedBuildInputs = with python3Packages; [

6
pkgs/tools/misc/cloud-sql-proxy/default.nix
View File

@ -5,18 +5,18 @@
buildGoModule rec {
pname = "cloud-sql-proxy";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "cloud-sql-proxy";
rev = "v${version}";
hash = "sha256-/mXaNRTRIBIPUHY/MOHpGmpB8wBp18wwftn/EdmoffQ=";
hash = "sha256-YbfN9ZdcxP78/dNaONBhb1UqcZYJcet+lHuKmvXk9MI=";
};
subPackages = [ "." ];
vendorSha256 = "sha256-VadE9E4B8BIIHGl+PN4oDl0H56xE3GQn0MxGw5fGsvM=";
vendorHash = "sha256-2Cu9o26R9y2EBUB9kLf98n2AKFOE7NE1NrcMD+8pvRY=";
preCheck = ''
buildFlagsArray+="-short"

4
pkgs/tools/misc/diffoscope/default.nix
View File

@ -78,11 +78,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3.pkgs.buildPythonApplication rec {
pname = "diffoscope";
version = "246";
version = "247";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
hash = "sha256-z7wrc8hveKqMJsJMLQXO3z+wcJxpY8QFoYxTBUzfGPg=";
hash = "sha256-sbLny1eK/eyCQKeSUyQc3DTvlHeCp8rAgrx681KjvNQ=";
};
outputs = [

11
pkgs/tools/misc/gaphor/default.nix
View File

@ -59,7 +59,7 @@ buildPythonApplication rec {
desktopName = "Gaphor";
};
# We need to wrap it manually to resolve all icons
# Disable automatic wrapGAppsHook to prevent double wrapping
dontWrapGApps = true;
postInstall = ''
@ -67,10 +67,11 @@ buildPythonApplication rec {
'';
preFixup = ''
wrapProgram $out/bin/gaphor \
''${gappsWrapperArgs[@]} \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
)
'';
meta = with lib; {

6
pkgs/tools/misc/ollama/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "ollama";
version = "0.0.14";
version = "0.0.15";
src = fetchFromGitHub {
owner = "jmorganca";
repo = "ollama";
rev = "v${version}";
hash = "sha256-QFik6Vlo06s2Nz5tsS3yvm3JYhCTIZHMiphtqz99sTI=";
hash = "sha256-p2YLgLyjmf2MPvFue45+wW7kqKpUli9rX3aWNH08cDk=";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
@ -22,7 +22,7 @@ buildGoModule rec {
MetalKit
]);
vendorHash = "sha256-eAvedN47InwUcsWLtnzxuLnmyeOoxHEDtQy9kjsFJnE=";
vendorHash = "sha256-IgEf/WOc1eNGCif1fViIFxbgZAd6mHBqfxcaqH/WvGg=";
ldflags = [ "-s" "-w" ];

4
pkgs/tools/misc/pipreqs/default.nix
View File

@ -4,11 +4,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "pipreqs";
version = "0.4.11";
version = "0.4.13";
src = fetchPypi {
inherit pname version;
sha256 = "c793b4e147ac437871b3a962c5ce467e129c859ece5ba79aca83c20f4d9c3aef";
hash = "sha256-oX8WeIC2khvjdTPOTIHdxuIrRlwQeq1VfbQ7Gt1WqZs=";
};
propagatedBuildInputs = [ yarg docopt ];

6
pkgs/tools/misc/tere/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tere";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "mgunyho";
repo = "tere";
rev = "v${version}";
sha256 = "sha256-gEoy7pwZxlCIPTQZVPSo5TIdmSliSSePunXO3hD3Ryo=";
sha256 = "sha256-xqbFBRzBfTwSdkC8e85yANdVA45G6E1FYlTXP8QfVIk=";
};
cargoSha256 = "sha256-4XvVisRLSHw4jz+nUndWzS1IK2tnzmxdcgqNHHOvkQg=";
cargoHash = "sha256-Y2Zgo/VAJxzQd2cXxyiJS5AqcVRClAuUsEogivK3EJw=";
postPatch = ''
rm .cargo/config.toml;

4
pkgs/tools/networking/chisel/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "chisel";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "jpillora";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Rq8IBT29K3QiaYXFaARg5ak9llcNS/9laal/LrHM4zY=";
hash = "sha256-hZm0dVDwX6cHiN0TvAcHCWbMAf+k9CCQfC9nlV2vfN4=";
};
vendorHash = "sha256-i6Fb+jSP6LzZoPTHhjQi3YbPBWY6OmsORV8ATcLrHG0=";

4
pkgs/tools/networking/opensnitch/daemon.nix
View File

@ -18,13 +18,13 @@
buildGoModule rec {
pname = "opensnitch";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "opensnitch";
rev = "v${version}";
hash = "sha256-1ArwbewgZuoDF2lxY720yFQSsTuLR0WkS8vsTCr2FL4=";
hash = "sha256-C8Uuz2FC7Zu07ZmFpp+ejpNxkyC3/mM9J2dc5FUKx64=";
};
modRoot = "daemon";

1
pkgs/tools/package-management/deploy-rs/default.nix
View File

@ -29,5 +29,6 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/serokell/deploy-rs";
license = licenses.mpl20;
maintainers = with maintainers; [ teutat3s ];
mainProgram = "deploy";
};
}

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

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.9.11";
version = "2.9.12";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-OZAHB1QmdZSARHF7Nd8SzmTGfRk4Wi/89nVYjW0Cpso=";
hash = "sha256-XLSNBFblgDkGGimwx0KqgHfDOekj7GH81EaKQ106v5U=";
};
vendorHash = "sha256-L8EwfyYtsnQChs0KQW2e/tU3zKua1HdDX91YX5ay9qo=";
vendorHash = "sha256-/1F2aY3cRLRz06s1KXQ6bt7UgaZgiXEjS/5stGi7xIw=";
modRoot = "./v2";
subPackages = [

14
pkgs/tools/text/wrap/default.nix
View File

@ -8,18 +8,23 @@ buildGoModule rec {
owner = "Wraparound";
repo = "wrap";
rev = "v${version}";
sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77";
hash = "sha256-58wsH/e3X72S7tJUObazyvvkI8+B7DLPTBmQO9A+jmk=";
};
nativeBuildInputs = [ makeWrapper ];
vendorHash = "sha256-vg61Vypd+mSF9FyLFVpnS5UCTJDoobkDE1Cneg8O0RM=";
vendorSha256 = null; #vendorSha256 = "";
nativeBuildInputs = [ makeWrapper ];
patches = [
(fetchpatch {
name = "courier-prime-variants.patch";
url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch";
sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5";
hash = "sha256-hcUsRyv6XVN+GyMN7LXzXPsp8jYUKTJPaK+e5p4CO7U=";
})
# Fix build on Go 1.17+
(fetchpatch {
url = "https://github.com/Wraparound/wrap/commit/a222c18a7e0810486741684781ff6158a359a8ba.patch";
hash = "sha256-eIKvA91olfbNJhOhIUu3GOL/rbgX3m6unmU8nRdKbtc=";
})
];
@ -32,6 +37,5 @@ buildGoModule rec {
homepage = "https://github.com/Wraparound/wrap";
license = licenses.gpl3Only;
maintainers = [ maintainers.austinbutler ];
broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
};
}

4
pkgs/tools/virtualization/cri-tools/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cri-tools";
version = "1.27.1";
version = "1.28.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GcfRnYOMrkMBIc2s6u/kwzh1kCFo2+PQCIcQyXxVdDM=";
sha256 = "sha256-inw4bPeObMlwtgFLR/8+tqRKTkcViZeEFZ1MOm0HYI4=";
};
vendorHash = null;

1
pkgs/top-level/aliases.nix
View File

@ -833,6 +833,7 @@ mapAliases ({
kexpand = throw "kexpand awless has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-01
keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22
keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14
kfctl = throw "kfctl is broken and has been archived by upstream" ; # Added 2023-08-21
kgx = gnome-console; # Added 2022-02-19
kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09
kicad-with-packages3d = kicad; # Added 2019-11-25

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

@ -9666,8 +9666,6 @@ with pkgs;
jdk = jdk11;
};
kfctl = callPackage ../applications/networking/cluster/kfctl { };
kluctl = callPackage ../applications/networking/cluster/kluctl { };
kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { };