nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-01-23 12:01:17 +00:00
committed by GitHub
parent b7a76c8b5e 05f11d5cf8
commit 568f381221
57 changed files with 331 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/CODEOWNERS vendored
View File

@@ -20,7 +20,7 @@
# Libraries
/lib @infinisil
/lib/systems @alyssais @ericson2314 @amjoseph-nixpkgs
/lib/systems @alyssais @ericson2314
/lib/generators.nix @infinisil @Profpatsch
/lib/cli.nix @infinisil @Profpatsch
/lib/debug.nix @infinisil @Profpatsch
@@ -41,10 +41,10 @@
/pkgs/top-level/stage.nix @Ericson2314
/pkgs/top-level/splice.nix @Ericson2314
/pkgs/top-level/release-cross.nix @Ericson2314
/pkgs/stdenv/generic @Ericson2314 @amjoseph-nixpkgs
/pkgs/stdenv/generic @Ericson2314
/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @piegamesde
/pkgs/stdenv/cross @Ericson2314 @amjoseph-nixpkgs
/pkgs/build-support/cc-wrapper @Ericson2314 @amjoseph-nixpkgs
/pkgs/stdenv/cross @Ericson2314
/pkgs/build-support/cc-wrapper @Ericson2314
/pkgs/build-support/bintools-wrapper @Ericson2314
/pkgs/build-support/setup-hooks @Ericson2314
/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
@@ -157,7 +157,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
# C compilers
/pkgs/development/compilers/gcc @amjoseph-nixpkgs
/pkgs/development/compilers/gcc
/pkgs/development/compilers/llvm @RaitoBezarius
/pkgs/development/compilers/emscripten @raitobezarius
/doc/languages-frameworks/emscripten.section.md @raitobezarius
@@ -340,9 +340,6 @@ nixos/tests/zfs.nix @raitobezarius
/pkgs/development/compilers/zig @figsoda
/doc/hooks/zig.section.md @figsoda
# Linux Kernel
pkgs/os-specific/linux/kernel/manual-config.nix @amjoseph-nixpkgs
# Buildbot
nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq
nixos/tests/buildbot.nix @Mic92 @zowoq

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@@ -81,6 +81,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857)
- `inetutils` now has a lower priority to avoid shadowing the commonly used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`.
- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`.
- The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead.

2
nixos/tests/dolibarr.nix
View File

@@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "dolibarr";
meta.maintainers = [ lib.maintainers.raitobezarius ];
meta.maintainers = [ ];
nodes.machine =
{ ... }:

4
pkgs/applications/audio/qpwgraph/default.nix
View File

@@ -13,14 +13,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qpwgraph";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${finalAttrs.version}";
sha256 = "sha256-oB8/q0igSZoaDzKzgmGAECU0qJwO67t9qWw+fB2vfxg=";
sha256 = "sha256-GlXUQz7tj7dfxVikvu0idzhQaq7raFC9jxJ2zFeHBQU=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

6
pkgs/applications/misc/blender/default.nix
View File

@@ -1,5 +1,5 @@
{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libepoxy, libXi, libX11, libXext, libXrender
, libepoxy, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages
, openvdb, libXxf86vm, tbb, alembic
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: rec {
]
++ lib.optionals waylandSupport [ pkg-config ];
buildInputs =
[ boost ffmpeg gettext glew ilmbase
[ boost ffmpeg gettext glew
freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp
opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc
alembic
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: rec {
"-DOPTIX_ROOT_DIR=${optix}"
];
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}";
env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
# Since some dependencies are built with gcc 6, we need gcc 6's
# libstdc++ in our RPATH. Sigh.

7
pkgs/applications/misc/prusa-slicer/default.nix
View File

@@ -1,8 +1,5 @@
{ stdenv
, lib
, openexr
, jemalloc
, c-blosc
, binutils
, fetchFromGitHub
, cmake
@@ -63,9 +60,7 @@ let
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
};
});
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
buildInputs = [ openexr boost tbb_2021_8 jemalloc c-blosc ilmbase ];
});
openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_8; };
wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override;
in
stdenv.mkDerivation (finalAttrs: {

33
pkgs/applications/networking/cluster/docker-machine/default.nix
View File

@@ -1,33 +0,0 @@
# This file was generated by go2nix.
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
buildGoPackage rec {
pname = "machine";
version = "0.16.2";
goPackagePath = "github.com/docker/machine";
src = fetchFromGitHub {
rev = "v${version}";
owner = "docker";
repo = "machine";
sha256 = "sha256-Mo2OGpem3p6hCNJ46+RH3BfC7kmKB4yk4Vzo38K88UM=";
};
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
pushd go/src/${goPackagePath}/contrib/completion
installShellCompletion --bash bash/*
installShellCompletion --zsh zsh/*
popd
'';
meta = with lib; {
homepage = "https://docs.docker.com/machine/";
description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts";
license = licenses.asl20;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};
}

21
pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
View File

@@ -1,21 +0,0 @@
# This file was generated by go2nix.
[
{
goPackagePath = "github.com/docker/machine";
fetch = {
type = "git";
url = "https://github.com/docker/machine";
rev = "457c02d06a155827c1c4af9b5ab38c0b6b4e48ea";
sha256 = "0hx5bhjc7q9ml6h6d2a5csqg6vqwjj68599q0cccw3pcfrb34gmd";
};
}
{
goPackagePath = "github.com/libvirt/libvirt-go";
fetch = {
type = "git";
url = "https://github.com/libvirt/libvirt-go";
rev = "e9642325d747c353ca7b76b4893d5dbdc81c296f";
sha256 = "1822b2kbwyxb2gigbiashcs7v4fsyw7k3sdlqh43ga0l6058fmhl";
};
}
]

28
pkgs/applications/networking/cluster/docker-machine/kvm.nix
View File

@@ -1,28 +0,0 @@
# This file was generated by go2nix.
{ lib, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }:
buildGoPackage rec {
pname = "docker-machine-kvm";
version = "0.10.0";
goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
goDeps = ./kvm-deps.nix;
src = fetchFromGitHub {
rev = "v${version}";
owner = "dhiltgen";
repo = "docker-machine-kvm";
sha256 = "0ch4zwb6h7hnr5l3skj1daypvpyms2i666lbnmakpw1fw3zvjmgy";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libvirt ];
meta = with lib; {
homepage = "https://github.com/dhiltgen/docker-machine-kvm";
description = "KVM driver for docker-machine";
license = licenses.asl20;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};
}

41
pkgs/applications/networking/cluster/docker-machine/xhyve.nix
View File

@@ -1,41 +0,0 @@
{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkg-config, cctools, Hypervisor, vmnet }:
buildGoPackage rec {
pname = "docker-machine-xhyve";
version = "0.4.0";
goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
# https://github.com/machine-drivers/docker-machine-driver-xhyve/pull/225
patches = fetchpatch {
url = "https://github.com/machine-drivers/docker-machine-driver-xhyve/commit/546256494bf2ccc33e4125bf45f504b0e3027d5a.patch";
sha256 = "1i8wxqccqkxvqrbsyd0g9s0kdskd8xi2jv0c1bji9aj4rq0a8cgz";
};
preBuild = ''
make -C go/src/${goPackagePath} CC=${stdenv.cc}/bin/cc LIBTOOL=${cctools}/bin/libtool GIT_CMD=: lib9p
export CGO_CFLAGS=-I$(pwd)/go/src/${goPackagePath}/vendor/github.com/jceel/lib9p
export CGO_LDFLAGS=$(pwd)/go/src/${goPackagePath}/vendor/build/lib9p/lib9p.a
'';
tags = [ "lib9p" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "machine-drivers";
repo = "docker-machine-driver-xhyve";
sha256 = "0000v97fr8xc5b39v44hsa87wrbk4bcwyaaivxv4hxlf4vlgg863";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ Hypervisor vmnet ];
meta = with lib; {
homepage = "https://github.com/machine-drivers/docker-machine-driver-xhyve";
description = "Xhyve driver for docker-machine";
license = licenses.bsd3;
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

4
pkgs/applications/networking/irc/weechat/default.nix
View File

@@ -36,14 +36,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "4.2.0";
version = "4.2.1";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
hash = "sha256-Mvam8hP7Y025MeKrjwGtuam1Dnf6ocUsoRbvoyBXWko=";
hash = "sha256-JT3fCG9shFAxot0pSxVShR1rBMwIovnaSu37Pi+Rvc0=";
};
# Why is this needed? https://github.com/weechat/weechat/issues/2031

38
pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch Normal file
View File

@@ -0,0 +1,38 @@
diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile
index fdf54565834a6a418f7267f4f8bf2269b80eab41..804dd76feb1a2d3b0278686f5326f7c2302e5fde 100644
--- a/3rdp/build/GNUmakefile
+++ b/3rdp/build/GNUmakefile
@@ -67,7 +67,7 @@
$(CRYPT_IDIR): | $(3RDPODIR)
$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR)
-$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
+$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch $(3RDP_ROOT)/build/cl-linux-yield.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
@echo Creating $@ ...
$(QUIET)-rm -rf $(CRYPT_SRC)/*
$(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC)
@@ -112,6 +112,7 @@
$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-fix-ssh-ecc-ephemeral.patch
$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-just-use-cc.patch
$(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-learn-numbers.patch
+ $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-linux-yield.patch
ifeq ($(CC),mingw32-gcc)
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts
diff --git a/3rdp/build/cl-linux-yield.patch b/3rdp/build/cl-linux-yield.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8cdfc8eafd3fd85f39bf0f8b519f25a31078fee4
--- /dev/null
+++ b/3rdp/build/cl-linux-yield.patch
@@ -0,0 +1,11 @@
+--- old/thread.h 2021-10-19 12:34:08.766649958 -0700
++++ kernel/thread.h 2021-10-19 12:34:43.794072316 -0700
+@@ -3005,7 +3005,7 @@
+ #endif /* Slowaris 5.7 / 7.x or newer */
+ #elif defined( _AIX ) || defined( __Android__ ) || defined( __CYGWIN__ ) || \
+ ( defined( __hpux ) && ( OSVERSION >= 11 ) ) || \
+- defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ )
++ defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ ) || defined(__linux__)
+ #define THREAD_YIELD() sched_yield()
+ #elif defined( __XMK__ )
+ /* The XMK underlying scheduling object is the process context, for which

18
pkgs/applications/terminal-emulators/syncterm/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, perl, unzip, autoPatchelfHook, ncurses, SDL2, alsa-lib }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, unzip, autoPatchelfHook, ncurses, SDL2, alsa-lib }:
stdenv.mkDerivation rec {
pname = "syncterm";
@@ -8,7 +8,18 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/${pname}/${pname}-${version}-src.tgz";
sha256 = "19m76bisipp1h3bc8mbq83b851rx3lbysxb0azpbr5nbqr2f8xyi";
};
sourceRoot = "${pname}-${version}/src/syncterm";
patches = [
# Cherry-picks from the upstream Synchronet tree, removing calls to `pthread_yield`.
# See upstream issue: https://gitlab.synchro.net/main/sbbs/-/issues/299
(fetchpatch {
url = "https://gitlab.synchro.net/main/sbbs/-/commit/851627df99f48d8eaad33d3a98ef309b4371f359.patch";
hash = "sha256-DbFAeJnrwFyfEpZgZFN8etqX6vQ3ca2TJwaqp0aHeo4=";
})
./0001-use-sched-yield-53264f2b.patch
];
# We can't use sourceRoot, as the cherry-picked patches apply to files outside of it.
postPatch = ''cd src/syncterm'';
CFLAGS = [
"-DHAS_INTTYPES_H"
@@ -32,8 +43,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
# error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin'
# broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = true; # sendmsg.c:(.text+0x1099): undefined reference to `pthread_yield'
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
homepage = "https://syncterm.bbsdev.net/";
description = "BBS terminal emulator";
maintainers = with maintainers; [ embr ];

14
pkgs/applications/video/anilibria-winmaclinux/default.nix
View File

@@ -2,6 +2,7 @@
, lib
, fetchFromGitHub
, qmake
, pkg-config
, qtbase
, qtquickcontrols2
, qtwebsockets
@@ -15,29 +16,27 @@
mkDerivation rec {
pname = "anilibria-winmaclinux";
version = "1.2.12";
version = "1.2.14";
src = fetchFromGitHub {
owner = "anilibria";
repo = "anilibria-winmaclinux";
rev = version;
sha256 = "sha256-J9MBnHrVnDaJ8Ykf/n8OkWKbK/JfMxorH9E+mKe3T8k=";
rev = "d941607f078c72fca104ee1e7916cc0ddcc0acf5";
sha256 = "sha256-G4KlYAjOT1UV29vcX7Q8dMTj0BX0rsJcLtK2MQag5nU=";
};
sourceRoot = "source/src";
qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ];
patches = [
./0001-fix-installation-paths.patch
./0002-disable-version-check.patch
./0003-build-with-vlc.patch
];
preConfigure = ''
substituteInPlace AniLibria.pro \
--replace "\$\$PREFIX" '${placeholder "out"}' \
--replace '@VLC_PATH@' '${libvlc}/include'
--replace "\$\$PREFIX" '${placeholder "out"}'
'';
qtWrapperArgs = [
@@ -52,6 +51,7 @@ mkDerivation rec {
nativeBuildInputs = [
qmake
pkg-config
wrapQtAppsHook
copyDesktopItems
];

1
pkgs/applications/video/streamlink-twitch-gui/bin.nix
View File

@@ -121,6 +121,7 @@ stdenv.mkDerivation rec {
downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
mainProgram = "streamlink-twitch-gui";
maintainers = with maintainers; [ rileyinman ];
platforms = [ "x86_64-linux" "i686-linux" ];
};

34
pkgs/by-name/ba/bankstown-lv2/package.nix Normal file
View File

@@ -0,0 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "bankstown-lv2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "chadmed";
repo = "bankstown";
rev = version;
hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg=";
};
cargoSha256 = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc=";
installPhase = ''
export LIBDIR=$out/lib
mkdir -p $LIBDIR
make
make install
'';
meta = with lib; {
homepage = "https://github.com/chadmed/bankstown";
description = "Halfway-decent three-stage psychoacoustic bass approximation";
license = licenses.mit;
maintainers = with maintainers; [ yuka ];
platforms = platforms.linux;
};
}

17
pkgs/by-name/ha/haredo/package.nix
View File

@@ -4,6 +4,8 @@
, hare
, scdoc
, nix-update-script
, makeWrapper
, bash
}:
stdenv.mkDerivation (finalAttrs: {
pname = "haredo";
@@ -20,9 +22,16 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
hare
makeWrapper
scdoc
];
enableParallelChecking = true;
doCheck = true;
dontConfigure = true;
preBuild = ''
HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)"
export HARECACHE
@@ -40,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
checkPhase = ''
runHook preCheck
./bin/haredo test
./bin/haredo ''${enableParallelChecking:+-j$NIX_BUILD_CORES} test
runHook postCheck
'';
@@ -53,8 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
dontConfigure = true;
doCheck = true;
postFixup = ''
wrapProgram $out/bin/haredo \
--prefix PATH : "${lib.makeBinPath [bash]}"
'';
setupHook = ./setup-hook.sh;

4
pkgs/by-name/ku/kubo/package.nix
View File

@@ -7,7 +7,7 @@
buildGoModule rec {
pname = "kubo";
version = "0.25.0"; # When updating, also check if the repo version changed and adjust repoVersion below
version = "0.26.0"; # When updating, also check if the repo version changed and adjust repoVersion below
rev = "v${version}";
passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version
@@ -15,7 +15,7 @@ buildGoModule rec {
# Kubo makes changes to its source tarball that don't match the git source.
src = fetchurl {
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
hash = "sha256-+Mk3rDdtjhETmdaOOSXEFdLTJ0nX9G3qUxctsu5vrSc=";
hash = "sha256-qvn5VqEPLkehFWamtPGRuDLJ06bd5bn1qZRp05jP2AY=";
};
# tarball contains multiple files/directories

18
pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix
View File

@@ -1,22 +1,22 @@
# Generated by update.sh script
{
"version" = "21.0.1";
"version" = "21.0.2";
"hashes" = {
"aarch64-linux" = {
sha256 = "0vb1bdbn4lqig4jihynacbyrj551m1pcmj6qh86kdwx0kn9400yy";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-aarch64_bin.tar.gz";
sha256 = "0yndazvc4kyr9widfn8ql5vd57m4m5inqz2wcpsarw38rs8ycjx3";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-aarch64_bin.tar.gz";
};
"x86_64-linux" = {
sha256 = "1gvkxqmbsh7pklh9bkhndh08nnjcmgq0xpzc96dgacqnlr4fx0sj";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz";
sha256 = "0j5ffszcaqv3fq159hyb611jm8w1q4n1cywmbd7vi69smad0cj5h";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-x64_bin.tar.gz";
};
"x86_64-darwin" = {
sha256 = "0sks663ldc0m3rhc882mzn44kipzbjw7325dhkpwy874p47j9zns";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-x64_bin.tar.gz";
sha256 = "1qfrn1068idnkzd6mdpw1x17sqrj59rz9avphj8225sxlhzsk2ks";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_macos-x64_bin.tar.gz";
};
"aarch64-darwin" = {
sha256 = "0i7zzq1czgc4lk1z278zp4cml4kdryafhrma5rqaja75933jpi2h";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-aarch64_bin.tar.gz";
sha256 = "1dssa3nhix7bqygdkkfp0b9myjg5f91dlgm8mf6r7qf7mj9klpji";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_macos-aarch64_bin.tar.gz";
};
};
}

6
pkgs/development/interpreters/starlark-rust/default.nix
View File

@@ -5,15 +5,15 @@
rustPlatform.buildRustPackage rec {
pname = "starlark-rust";
version = "0.10.0";
version = "0.11.0";
src = fetchCrate {
pname = "starlark_bin";
inherit version;
hash = "sha256-7AoNRTLyTYsUass9bMJMBUN+GrfUzEGM9cED5VsRESs=";
hash = "sha256-/dy9uzXLZipKzFaslOmlzeEsOD89pprwFTopYpsmHGM=";
};
cargoHash = "sha256-Q00JJRiubrxnI0nFQqUTbxTTB70XV93HJycjdlvV+74=";
cargoHash = "sha256-Ict1Lh+JPZ5dmC+ul0phcQug9nYeaILLCtaHQOI6qBk=";
meta = with lib; {
description = "A Rust implementation of the Starlark language";

10
pkgs/development/libraries/alembic/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe, ilmbase }:
{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe }:
stdenv.mkDerivation rec
{
@@ -20,13 +20,7 @@ stdenv.mkDerivation rec
nativeBuildInputs = [ cmake ];
# NOTE: Alembic also support imath instead of ilmbase, but some users of Alembic (e.g. Blender)
# are incompatible with the imath version of Alembic
buildInputs = [ openexr hdf5-threadsafe ilmbase ];
# Downstream packages trying to use Alembic via CMake need ilmbase as well
# For some reason this won't be picked up correctly otherwise
propagatedBuildInputs = [ ilmbase ];
buildInputs = [ openexr hdf5-threadsafe ];
# These flags along with the postPatch step ensure that all artifacts end up
# in the correct output without needing to move anything

32
pkgs/development/libraries/libewf-legacy/default.nix Normal file
View File

@@ -0,0 +1,32 @@
{ lib
, fetchurl
, fetchpatch
, stdenv
, zlib
, openssl
, libuuid
, pkg-config
, bzip2
}:
stdenv.mkDerivation rec {
pname = "libewf-ewf";
version = "20140814";
src = fetchurl {
url = "https://github.com/libyal/libewf-legacy/releases/download/${version}/libewf-${version}.tar.gz";
hash = "sha256-OM3QXwnaIDeo66UNjzmu6to53SxgCMn/rE9VTPlX5BQ=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib openssl libuuid ]
++ lib.optionals stdenv.isDarwin [ bzip2 ];
meta = {
description = "Legacy library for support of the Expert Witness Compression Format";
homepage = "https://sourceforge.net/projects/libewf/";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ d3vil0p3r ];
platforms = lib.platforms.unix;
};
}

2
pkgs/development/libraries/openimageio/default.nix
View File

@@ -3,7 +3,6 @@
, boost
, cmake
, giflib
, ilmbase
, libjpeg
, libpng
, libtiff
@@ -41,7 +40,6 @@ stdenv.mkDerivation rec {
buildInputs = [
boost
giflib
ilmbase
libjpeg
libpng
libtiff

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

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
{ lib, stdenv, fetchFromGitHub, cmake, boost, jemalloc, c-blosc, tbb, zlib }:
stdenv.mkDerivation rec
{
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec
nativeBuildInputs = [ cmake ];
buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
buildInputs = [ boost tbb jemalloc c-blosc zlib ];
cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ];

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

@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "clarifai-grpc";
version = "10.0.3";
version = "10.0.4";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Clarifai";
repo = "clarifai-python-grpc";
rev = "refs/tags/${version}";
hash = "sha256-mIiUwqagFlZXkm/diQlCXMBDAbnWNG4BNMHVedo5u/M=";
hash = "sha256-jhM+UfyaliVmUH6e3ArZvZokB8lDKS/fx8376cZwlQM=";
};
nativeBuildInputs = [

10
pkgs/development/python-modules/google-cloud-resource-manager/default.nix
View File

@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "1.10.4";
version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-RWsl3do9TNJ0iKcnNrvDrwTXE64v42VcAbZqM50o1nk=";
hash = "sha256-pkumu1lWNOzSRyuLAyLo8BKnYyd1Zlmi3enzktf6GvI=";
};
propagatedBuildInputs = [
@@ -48,8 +48,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Google Cloud Resource Manager API client library";
homepage = "https://github.com/googleapis/python-resource-manager";
changelog = "https://github.com/googleapis/python-resource-manager/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager";
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${version}/packages/google-cloud-resource-manager/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};

8
pkgs/development/python-modules/google-cloud-secret-manager/default.nix
View File

@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
version = "2.16.4";
version = "2.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Nx3HL5FFrzI+ioE8jlA4DmrEvWpdvNQtzzFi2PN+UIA=";
hash = "sha256-glTilgwGqNyRrqw8iUr7oIk6Z0WC8ODs/CL4lOYXPC8=";
};
propagatedBuildInputs = [
@@ -42,8 +42,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Secret Manager API API client library";
homepage = "https://github.com/googleapis/python-secret-manager";
changelog = "https://github.com/googleapis/python-secret-manager/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-secret-manager";
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-secret-manager-v${version}/packages/google-cloud-secret-manager/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ siriobalmelli ];
};

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

@@ -52,7 +52,7 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.1.0";
version = "0.1.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -61,7 +61,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langchain";
rev = "refs/tags/v${version}";
hash = "sha256-izaSah1S0INsskdzE9b7Iw4yWBsNmN5fBI6BQgaHgE4=";
hash = "sha256-cQz4u6FeVZLNbix4pyc6ulfj+nb/tARMJniusy7Q46A=";
};
sourceRoot = "${src.name}/libs/langchain";

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

@@ -45,7 +45,7 @@
buildPythonPackage rec {
pname = "mitmproxy";
version = "10.2.1";
version = "10.2.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
owner = "mitmproxy";
repo = "mitmproxy";
rev = "refs/tags/${version}";
hash = "sha256-BO7oQ4TVuZ4dCtROq2M24V6HVo0jzyBdQfb67dYA07U=";
hash = "sha256-oxhpaFW++on3eRXm0anXZDRo6g/X5IflTcZkFF8Kcps=";
};
nativeBuildInputs = [

24
pkgs/development/python-modules/openai/default.nix
View File

@@ -2,7 +2,6 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pythonRelaxDepsHook
, hatchling
# propagated
, httpx
@@ -11,6 +10,7 @@
, anyio
, distro
, sniffio
, cached-property
, tqdm
# optional
, numpy
@@ -26,38 +26,32 @@
buildPythonPackage rec {
pname = "openai";
version = "1.7.1";
version = "1.9.0";
pyproject = true;
disabled = pythonOlder "3.7.1";
src = fetchFromGitHub {
owner = "openai";
repo = "openai-python";
rev = "refs/tags/v${version}";
hash = "sha256-NXZ+7gDA3gMGSrmgceHxcR45LrXdazXbYuhcoUsNXew=";
hash = "sha256-+3tCttKWbWt3Nsf5E6NWYt0yLRV0kfj7Qz6PhaOmBsY=";
};
nativeBuildInputs = [
hatchling
pythonRelaxDepsHook
];
pythonRelaxDeps = [
# https://github.com/openai/openai-python/issues/921
"anyio"
];
propagatedBuildInputs = [
httpx
pydantic
typing-extensions
anyio
distro
sniffio
tqdm
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
cached-property
];
passthru.optional-dependencies = {
@@ -80,15 +74,13 @@ buildPythonPackage rec {
dirty-equals
];
pytestFlagsArray = [
"-W" "ignore::DeprecationWarning"
disabledTests = [
# makes network requests
"test_streaming_response"
];
OPENAI_API_KEY = "sk-foo";
disabledTestPaths = [
# makes network requests
"tests/test_client.py"
"tests/api_resources"
];

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

@@ -14,7 +14,7 @@
let
self = buildPythonPackage rec {
pname = "opentelemetry-api";
version = "1.21.0";
version = "1.22.0";
disabled = pythonOlder "3.7";
# to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta
@@ -22,7 +22,7 @@ let
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-igG0oHRa6M4d7pMp7fgBo13x5XADZeYgFAL8WzDXsyw=";
hash = "sha256-6BmBmooVaH1FOpgXpFlYth0r9XaNtmb9UezeP8hWEok=";
};
sourceRoot = "${src.name}/opentelemetry-api";

45
pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix Normal file
View File

@@ -0,0 +1,45 @@
{ buildPythonPackage
, flask
, hatchling
, opentelemetry-api
, opentelemetry-instrumentation
, opentelemetry-instrumentation-wsgi
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, opentelemetry-util-http
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-instrumentation-flask";
disabled = pythonOlder "3.7";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask";
format = "pyproject";
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [
flask
opentelemetry-api
opentelemetry-instrumentation
opentelemetry-instrumentation-wsgi
opentelemetry-semantic-conventions
opentelemetry-util-http
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
pythonImportsCheck = [ "opentelemetry.instrumentation.flask" ];
meta = opentelemetry-instrumentation.meta // {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-flask";
description = "Flask Middleware for OpenTelemetry based on the WSGI middleware";
};
}

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

@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "opentelemetry-instrumentation";
version = "1.16.0";
version = "0.43b0";
disabled = pythonOlder "3.7";
# to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "open-telemetry";
repo = "opentelemetry-python-contrib";
rev = "refs/tags/v${version}";
hash = "sha256-6tGQjPBej2zv5yJN0S46le3kyD7q3TELYyDmyxlp5Wo=";
hash = "sha256-fUyA3cPXAxO506usEWxOUX9xiapc8Ocnbx73LP6ghRE=";
};
sourceRoot = "${src.name}/opentelemetry-instrumentation";

6
pkgs/development/python-modules/opentelemetry-util-http/default.nix
View File

@@ -33,6 +33,12 @@ buildPythonPackage {
pytestCheckHook
];
# https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1940
disabledTests = [
"test_nonstandard_method"
"test_nonstandard_method_allowed"
];
pythonImportsCheck = [ "opentelemetry.util.http" ];
meta = opentelemetry-instrumentation.meta // {

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

@@ -23,7 +23,7 @@
, ptex
, embree
, alembic
, openexr
, imath
, flex
, bison
, qt6
@@ -94,7 +94,7 @@ buildPythonPackage rec {
ptex
embree
alembic.dev
openexr
imath
flex
bison
boost

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

@@ -10,14 +10,14 @@ let
inherit (darwin) autoSignDarwinBinariesHook;
in buildPythonPackage (rec {
pname = "PyQtWebEngine";
version = "5.15.4";
version = "5.15.6";
format = "pyproject";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f";
sha256 = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE=";
};
postPatch = ''

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

@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "python-openstackclient";
version = "6.3.0";
version = "6.4.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-m6C9+NAwh+WFtAqNzEKc673V/ewkwdYKECv58zEyDfE=";
hash = "sha256-DGq0AWjqUf7WiBmqJR+CU96aYdrMlt0bZHOfGJ/CGD8=";
};
nativeBuildInputs = [

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

@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "yappi";
version = "1.4.0";
version = "1.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "sumerc";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-AogBnqhLcwsyTHLP+Uxc+EOgYzhdwX5rbi9RMCuC2IU=";
hash = "sha256-zA4apOGyrbjBOxUKBARiKmmM9rSVFVGWsDpOaItOoLU=";
};
patches = [

2
pkgs/development/tools/build-managers/bear/default.nix
View File

@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/rizsotto/Bear";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ babariviere qyliss ];
maintainers = with maintainers; [ babariviere ];
};
}

32
pkgs/development/tools/misc/blackfire/php-probe.nix
View File

@@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions
let
phpMajor = lib.versions.majorMinor php.version;
version = "1.92.6";
version = "1.92.8";
hashes = {
"x86_64-linux" = {
system = "amd64";
hash = {
"8.1" = "sha256-ygBgs6tGZyim69tCol+tTXV5Lt/JLuatmKAo9aomM1s=";
"8.2" = "sha256-TrT7H2Tbu4ZrfeCUjpqlTMw9DAxS62aLvzTbpAdsZOc=";
"8.3" = "sha256-AH/kYlpVjCwXxNa90Qe5XpzAdSyNn9jdeyYTLlXxfLI=";
"8.1" = "sha256-zN39X2hd++Z5cj9JN3Athiq9j12i7/Q5QCnohw8PVDk=";
"8.2" = "sha256-ZgzegspY+aXQDLfRvDBDm+FtY4VzM/OWJG0ZSr4OAag=";
"8.3" = "sha256-o0ARDtcn5m6z+Ll+QT1JOR1jH2wJNNz1URV9BePViTU=";
};
};
"i686-linux" = {
system = "i386";
hash = {
"8.1" = "sha256-c1i6eq7l4LeUpuZCsYzS1N++IU4j0WydCxPokSJf6dI=";
"8.2" = "sha256-gWhyUQ3QP13klusSv7KWdHatnjy/4k17VvHJUCtqF1g=";
"8.3" = "sha256-kI3sVcI/bDVRMcjzPzlai1D2HvmBTXwQ3DF5zcp2GJk=";
"8.1" = "sha256-8Qr1H9lgf8FxBLPTbxueSqi1S5y3HC3kzRQupfQkTew=";
"8.2" = "sha256-exrpoA74Ikr3YWcUIB8ZTCkKnJ7YeK4yZ6oDfpcQ3Sg=";
"8.3" = "sha256-7JirGgtQj8+mtyhEJOiM480bQ+98tv59r4LbMX6/X9Q=";
};
};
"aarch64-linux" = {
system = "arm64";
hash = {
"8.1" = "sha256-1QPKTNOsJTrx+Q0MigiMBDCC7X3YlSDB33gy8DU9KBg=";
"8.2" = "sha256-e3YUAOLWSmsiHczb44oRiOIafMSBWQaJY+m4OSUMzV8=";
"8.3" = "sha256-h0/ZEy6IkIpAfeL0Al7a+FpPeX2KMSd7zD1i1ew5rUk=";
"8.1" = "sha256-ubNi2WxOuZ10OZhVzroIjfpBxg1gC1s9Nddj+U4fx5M=";
"8.2" = "sha256-iUTCgJxmMtuNiT6+TqCqgKIVXF0THQgycxLiDUYdaeo=";
"8.3" = "sha256-EwVe/hlengd+87w9xpA+pWGu8iXQh5Ldr4tZVgGps2M=";
};
};
"aarch64-darwin" = {
system = "arm64";
hash = {
"8.1" = "sha256-gLCPTTCfoBgp3GgKzVisfGlxQsYa+4x2WDwvhwcf1R8=";
"8.2" = "sha256-OtWUwkeLGfxkxjGSDMyv61UVoSwFo1puGjmwYOB51nI=";
"8.3" = "sha256-M3lz0TnTuJVgD32RS3ffcZsKVJdyx75AjSKFkkODiSE=";
"8.1" = "sha256-bSPOUxQpTIsC2pZ95kLvrWJVVUb1bf51ety26miyxy8=";
"8.2" = "sha256-lncGFHCENSoVMGvKgsE5yBhThsfZ2xdIVDoVgECDV+w=";
"8.3" = "sha256-6hVAlaN48OLrGEsoqBo+JdNV+NxWpmLwAdv9ymaWkHY=";
};
};
"x86_64-darwin" = {
system = "amd64";
hash = {
"8.1" = "sha256-dVau4kieQsj4m97Sepw1jMRtf1VCUnvZEJjVsO+hFWs=";
"8.2" = "sha256-HRBVr4JTiZDRzIt6JfITD5N824Ivcag6DUyEhsc23co=";
"8.3" = "sha256-nRRG42/Yhsupln4j7nWlKvfQ067fwQ17un1yXplPf14=";
"8.1" = "sha256-aRLxX2FULffZHUNYyrpypLN+XINC+NTaRMIulh61M1o=";
"8.2" = "sha256-Ma9EgcoM4x3iK8ygcEte/Wtip+/Z4Prs2CvITxGoaLM=";
"8.3" = "sha256-6vPcc5ogaQs7Z/o4jMR0VX2r5Mq1vpxdf0hvMrQGxZE=";
};
};
};

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

@@ -8,17 +8,17 @@
}:
rustPlatform.buildRustPackage rec {
version = "0.7.5";
version = "0.7.6";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = "v${version}";
sha256 = "sha256-rql5Nj/w7cNaO6UKK96vYYE2E19RIiCHYHTnbW+U4n8=";
sha256 = "sha256-dIUwooXphjXpFMZXpwQMSvXRvVt/y6J5X7oCrBBSvBM=";
};
cargoHash = "sha256-VdI39DgQrUZhoawMqBC6ngTvldW+QbDjMjxjjbH9G1A=";
cargoHash = "sha256-GDODIAyTIZUHw2tUEQfNnnPH2S9pFHIjYEZLpM5E52A=";
nativeBuildInputs = [
pkg-config

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

@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deb";
version = "2.0.0";
version = "2.0.4";
src = fetchFromGitHub {
owner = "kornelski";
repo = pname;
rev = "v${version}";
hash = "sha256-DgKGnIA2ovBLja+r+nYZ97UPaWO7a7RXeXa10guZBTc=";
hash = "sha256-vIWgkaAprbsdfPUZvyfxJm7wZxExKcV9jkz/A/G6tAo=";
};
cargoHash = "sha256-Sv9i8f0ywMNvjA2yvCX+2ZhFuNCovEGiaMxkg/IV36g=";
cargoHash = "sha256-EMbqIpFWbUvZaszsYSJaOEl+vm3mrmub7mdfeJPEX7Y=";
nativeBuildInputs = [
makeWrapper

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

@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-license";
version = "0.5.1";
version = "0.6.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-M/QGM8jPLrDIoF1TVYDoVcHni1qaRCyZwHlYgia24Ro=";
sha256 = "sha256-hBlyRk23gRfKdYuVnrFoDE883S32X9DFvTIsR2zfJck=";
};
cargoSha256 = "sha256-2m+ornrQQzijyF30uQ6xpEiid6r6I1wTa8nn6Q0wNKo=";
cargoHash = "sha256-4P2kR+Jxki62IdUKpMNL7hzBQWci2tKWrQXV5rkMXkw=";
meta = with lib; {
description = "Cargo subcommand to see license of dependencies";

6
pkgs/games/ddnet/default.nix
View File

@@ -35,19 +35,19 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "17.4.2";
version = "18.0.1";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
hash = "sha256-cu6EmCaT8nMCcXUwvZdWog/4bvHQo9+DZHDHRvun2E4=";
hash = "sha256-CgmFljI9/S544Hm9J4CEqvNgepPM02JgJZJ5HX1d3wU=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
hash = "sha256-O4ORWuTlmEMsTpMEhnauNfXOKWfg8hB32rZKRe8Nmp4=";
hash = "sha256-oGZOgSPMnrzwEyUvXqdfquCWCFslPfD9C0vT8mILI+s=";
};
nativeBuildInputs = [

4
pkgs/games/maptool/default.nix
View File

@@ -12,11 +12,11 @@
}:
let
pname = "maptool";
version = "1.13.2";
version = "1.14.3";
repoBase = "https://github.com/RPTools/maptool";
src = fetchurl {
url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";
hash = "sha256-Ntmro+t4qpP5BXW20t97ki0wt2NKaK5yQarsxDEKbb0=";
hash = "sha256-KjP6zugQw9r1hvdxqOgTrt4hYMYg+lgjkgkj3tfb38s=";
};
meta = with lib; {

1
pkgs/os-specific/linux/iotop/default.nix
View File

@@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec {
description = "A tool to find out the processes doing the most IO";
homepage = "http://guichaz.free.fr/iotop";
license = licenses.gpl2;
mainProgram = "iotop";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
};

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@@ -6,14 +6,14 @@ let
# NOTE: When updating these, please also take a look at the changes done to
# kernel config in the xanmod version commit
ltsVariant = {
version = "6.1.72";
hash = "sha256-S8Ilrce7xQb549NPIBRIMMIng4xY77Hbq58rE5LOow8=";
version = "6.1.74";
hash = "sha256-PqCojvh7JwTcavtQHB8l/WxCTg94ndOy9KGVXsmGO/Y=";
variant = "lts";
};
mainVariant = {
version = "6.6.10";
hash = "sha256-5BymQhVWMHg4zlQIPxf40JQI9iSWQqTZfbDd6+G3RsQ=";
version = "6.6.13";
hash = "sha256-RTfa9eIGYDqnffFnOFNaghKoGcHVy4rGYQkYumcw6Tk=";
variant = "main";
};

4
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@@ -38,12 +38,12 @@ in
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
version = "3.12.11";
version = "3.12.12";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
hash = "sha256-WGlSYRUrKhtku9+MXjNu1Gm+Ddox2iQ8rwZKUh1QPsM=";
hash = "sha256-lR/qwEoEH8v6oTTz6oAMlk2Tl2QSCEWV9rnU+gXX2KY=";
};
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];

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

@@ -21,16 +21,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2023-12-23T07-19-11Z";
version = "2024-01-18T22-51-28Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-1tgJraaF40GSBAnczzf0tdJMH8AXORmhpnEpVxe5yjc=";
sha256 = "sha256-O0MvwX8fD6QKaFTSfat9eVV+gY9ZaWIvxOpevwZaODw=";
};
vendorHash = "sha256-TGdMKzpMRAEE1TpEU6IJKu3A6A1uC2BtifDxCfH9Fd0=";
vendorHash = "sha256-zB5yaWY0MhksqhrJfmfkpwlZio0p291t9ETESgADBjg=";
doCheck = false;

2
pkgs/servers/web-apps/dolibarr/default.nix
View File

@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
description = "A enterprise resource planning (ERP) and customer relationship manager (CRM) server";
homepage = "https://dolibarr.org/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.raitobezarius ];
maintainers = [ ];
};
}

26
pkgs/tools/filesystems/convoy/default.nix
View File

@@ -1,26 +0,0 @@
# This file was generated by go2nix.
{ lib, buildGoPackage, fetchFromGitHub, lvm2 }:
buildGoPackage rec {
pname = "convoy";
version = "0.5.2";
goPackagePath = "github.com/rancher/convoy";
src = fetchFromGitHub {
rev = "v${version}";
owner = "rancher";
repo = "convoy";
sha256 = "09nygrxd5hril4xcfsvgjg74xxhhimznqq4sdk0f360c5ra0dbhj";
};
buildInputs = [lvm2];
meta = with lib; {
homepage = "https://github.com/rancher/convoy";
description = "A Docker volume plugin, managing persistent container volumes";
license = licenses.asl20;
maintainers = with maintainers; [ offline ];
platforms = platforms.linux;
};
}

11
pkgs/tools/networking/inetutils/default.nix
View File

@@ -6,6 +6,7 @@
, help2man
, apparmorRulesFromClosure
, libxcrypt
, util-linux
}:
stdenv.mkDerivation rec {
@@ -87,5 +88,15 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.unix;
/**
The `logger` binary from `util-linux` is preferred over `inetutils`.
To instead prioritize this package, set a _lower_ `meta.priority`, or
use e.g. `lib.setPrio 5 inetutils`.
Note that the default `meta.priority` is defined in `buildEnv` and is
currently 5.
*/
priority = (util-linux.meta.priority or 5) + 1;
};
}

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

@@ -6,11 +6,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "picosnitch";
version = "1.0.1";
version = "1.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "5d427eb46de448e4109f68ed435dd38426df8200aea5bb668639aabe1f0b4580";
sha256 = "78285e91b5c4d8e07529a34a7c3fe606acb6f950ee3cc78bb6c346bc2195b68a";
};
propagatedBuildInputs = with python3.pkgs; [

1
pkgs/tools/virtualization/alpine-make-vm-image/default.nix
View File

@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/alpinelinux/alpine-make-vm-image";
description = "Make customized Alpine Linux disk image for virtual machines";
maintainers = with maintainers; [ qyliss ];
license = licenses.mit;
platforms = platforms.unix;
mainProgram = "alpine-make-vm-image";

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

@@ -172,6 +172,7 @@ mapAliases ({
compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10
concurrencykit = libck; # Added 2021-03
connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08
convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27
cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
cvs_fast_export = cvs-fast-export; # Added 2021-06-10
@@ -211,6 +212,9 @@ mapAliases ({
devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13
dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04
dnnl = oneDNN; # Added 2020-04-22
docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27
docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27
docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27
dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
dolphinEmu = dolphin-emu; # Added 2021-11-10
dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10

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

@@ -7258,8 +7258,6 @@ with pkgs;
convmv = callPackage ../tools/misc/convmv { };
convoy = callPackage ../tools/filesystems/convoy { };
cpcfs = callPackage ../tools/filesystems/cpcfs { };
coreutils = callPackage ../tools/misc/coreutils { };
@@ -11756,6 +11754,7 @@ with pkgs;
then (overrideLibcxx llvmPackages_15.stdenv).cc
else clang_15;
llvm = llvm_15;
openexr = openexr_3;
};
osqp = callPackage ../development/libraries/science/math/osqp { };
@@ -30355,7 +30354,9 @@ with pkgs;
akira-unstable = callPackage ../applications/graphics/akira { };
alembic = callPackage ../development/libraries/alembic { };
alembic = callPackage ../development/libraries/alembic {
openexr = openexr_3;
};
alfaview = callPackage ../applications/networking/instant-messengers/alfaview { };
@@ -30662,6 +30663,7 @@ with pkgs;
blender = callPackage ../applications/misc/blender {
# LLVM 11 crashes when compiling GHOST_SystemCocoa.mm
stdenv = if stdenv.isDarwin then llvmPackages_10.stdenv else stdenv;
openexr = openexr_3;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL;
};
@@ -31126,15 +31128,8 @@ with pkgs;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };
docker-machine = callPackage ../applications/networking/cluster/docker-machine { };
docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { };
docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { };
docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix {
inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
inherit (darwin) cctools;
};
docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { };
@@ -34401,7 +34396,9 @@ with pkgs;
openfx = callPackage ../development/libraries/openfx { };
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { };
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio {
openexr = openexr_3;
};
openjump = callPackage ../applications/misc/openjump { };
@@ -37927,8 +37924,8 @@ with pkgs;
# MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging
# at launch in a class initialization deadlock. MapTool ships Temurin with
# their pre-built releases so we might as well use it too.
jre = temurin-bin-17;
openjfx = openjfx17;
jre = temurin-bin-21;
openjfx = openjfx21;
};
mari0 = callPackage ../games/mari0 { };

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

@@ -8772,6 +8772,8 @@ self: super: with self; {
opentelemetry-instrumentation-django = callPackage ../development/python-modules/opentelemetry-instrumentation-django { };
opentelemetry-instrumentation-flask = callPackage ../development/python-modules/opentelemetry-instrumentation-flask { };
opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { };
opentelemetry-instrumentation-wsgi = callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi { };