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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-02 12:06:01 +00:00
committed by GitHub
parent f550db9e18 4aa8416117
commit 4b7982e09d
53 changed files with 357 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/modules.nix
+1 -1
View File
@@ -861,7 +861,7 @@ let
else
# (nixos-option detects this specific error message and gives it special
# handling. If changed here, please change it there too.)
throw "The option `${showOption loc}' is used but not defined.";
throw "The option `${showOption loc}' was accessed but has no value defined. Try setting the option.";
isDefined = defsFinal != [];
lib/tests/modules.sh
+4 -4
View File
@@ -312,7 +312,7 @@ checkConfigOutput '^".*Hello.*"$' options.namedPackage.description ./declare-mkP
checkConfigOutput '^"hello"$' config.pathPackage.pname ./declare-mkPackageOption.nix
checkConfigOutput '^"pkgs\.hello\.override \{ stdenv = pkgs\.clangStdenv; \}"$' options.packageWithExample.example.text ./declare-mkPackageOption.nix
checkConfigOutput '^".*Example extra description\..*"$' options.packageWithExtraDescription.description ./declare-mkPackageOption.nix
checkConfigError 'The option .undefinedPackage. is used but not defined' config.undefinedPackage ./declare-mkPackageOption.nix
checkConfigError 'The option .undefinedPackage. was accessed but has no value defined. Try setting the option.' config.undefinedPackage ./declare-mkPackageOption.nix
checkConfigOutput '^null$' config.nullablePackage ./declare-mkPackageOption.nix
checkConfigOutput '^"null or package"$' options.nullablePackageWithDefault.type.description ./declare-mkPackageOption.nix
checkConfigOutput '^"myPkgs\.hello"$' options.packageWithPkgsText.defaultText.text ./declare-mkPackageOption.nix
@@ -410,7 +410,7 @@ checkConfigOutput '^null$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-
checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix
# Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf
checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix
checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix
checkConfigError 'The option .* was accessed but has no value defined. Try setting the option.' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix
checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix
# submodules in freeformTypes should have their locations annotated
checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix
@@ -469,8 +469,8 @@ checkConfigOutput "{}" config.attrs.a ./emptyValues.nix
checkConfigOutput "null" config.null.a ./emptyValues.nix
checkConfigOutput "{}" config.submodule.a ./emptyValues.nix
# These types don't have empty values
checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix
checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix
checkConfigError 'The option .int.a. was accessed but has no value defined. Try setting the option.' config.int.a ./emptyValues.nix
checkConfigError 'The option .nonEmptyList.a. was accessed but has no value defined. Try setting the option.' config.nonEmptyList.a ./emptyValues.nix
# types.unique
# requires a single definition
nixos/doc/manual/release-notes/rl-2411.section.md
+6
View File
@@ -4,6 +4,12 @@
## Highlights {#sec-release-24.11-highlights}
- **This will be the latest version of Nixpkgs to support macOS 10.12 (Sierra).**
Starting with release 25.05, the minimum supported version will be macOS 11 (Big Sur).
From that point on, packages may or may not work on older releases of macOS.
Users on old macOS versions should consider upgrading to a supported OS release (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS.
If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to OS X 10.6 (Snow Leopard).
- Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`.
- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option.
nixos/modules/virtualisation/qemu-vm.nix
+1 -1
View File
@@ -329,7 +329,7 @@ in
virtualisation.diskSize =
mkOption {
type = types.nullOr types.ints.positive;
type = types.ints.positive;
default = 1024;
description = ''
The disk size in megabytes of the virtual machine.
pkgs/applications/graphics/rawtherapee/default.nix
+28 -13
View File
@@ -1,9 +1,17 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, cmake
, pkg-config
, util-linux
, libselinux
, libsepol
, lerc
, libthai
, libdatrie
, libxkbcommon
, libepoxy
, libXtst
, wrapGAppsHook3
, makeWrapper
, pixman
@@ -15,37 +23,31 @@
, libiptcdata
, fftw
, expat
, pcre
, pcre2
, libsigcxx
, lensfun
, librsvg
, libcanberra-gtk3
, gtk-mac-integration
, exiv2
, libraw
, libjxl
}:
stdenv.mkDerivation rec {
pname = "rawtherapee";
version = "5.10";
version = "5.11";
src = fetchFromGitHub {
owner = "Beep6581";
repo = "RawTherapee";
rev = version;
hash = "sha256-rIwwKNm7l7oPEt95sHyRj4aF3mtnvM4KAu8oVaIMwyE=";
hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730=";
# The developpers ask not to use the tarball from Github releases, see
# https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers
forceFetchGit = true;
};
# https://github.com/Beep6581/RawTherapee/issues/7074
patches = [
(fetchurl {
url = "https://github.com/Beep6581/RawTherapee/commit/6b9f45c69c1ddfc3607d3d9c1206dcf1def30295.diff";
hash = "sha256-3Rti9HV8N1ueUm5B9qxEZL7Lb9bBb+iy2AGKMpJ9YOM=";
})
];
postPatch = ''
echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake
substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \
@@ -61,6 +63,15 @@ stdenv.mkDerivation rec {
];
buildInputs = [
util-linux
libselinux
libsepol
lerc
libthai
libdatrie
libxkbcommon
libepoxy
libXtst
pixman
libpthreadstubs
gtkmm3
@@ -70,11 +81,13 @@ stdenv.mkDerivation rec {
libiptcdata
fftw
expat
pcre
pcre2
libsigcxx
lensfun
librsvg
exiv2
libraw
libjxl
] ++ lib.optionals stdenv.isLinux [
libcanberra-gtk3
] ++ lib.optionals stdenv.isDarwin [
@@ -84,6 +97,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DPROC_TARGET_NUMBER=2"
"-DCACHE_NAME_SUFFIX=\"\""
"-DWITH_SYSTEM_LIBRAW=\"ON\""
"-DWITH_JXL=\"ON\""
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
];
pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubectl-cnpg";
version = "1.23.3";
version = "1.24.0";
src = fetchFromGitHub {
owner = "cloudnative-pg";
repo = "cloudnative-pg";
rev = "v${version}";
hash = "sha256-78XvVPWhsvu7shbU2fJ+/7NnGxUXLLOeR28OPkUUw2A=";
hash = "sha256-/BUrUksNT6KuVLxJxnBfkU9OEeQU3u7WA6pKqcGnuSU=";
};
vendorHash = "sha256-Y5HmoxMLs2rvpLycH5bMd9awHrNeIOkwn7m53hCAWug=";
vendorHash = "sha256-s1fKwWfOSgRw6eOPc1aZzf1VzaTVHXBjQWd1132vAS0=";
subPackages = [ "cmd/kubectl-cnpg" ];
pkgs/applications/office/beamerpresenter/default.nix
+2 -2
View File
@@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "beamerpresenter";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "stiglers-eponym";
repo = "BeamerPresenter";
rev = "v${version}";
hash = "sha256-UQbyzkFjrIDPcrE6yGuOWsXNjz8jWyJEWiQwHmf91/8=";
hash = "sha256-ofS0KMsn0KG8squIvMPxSCgE/qNK+Kd47psNziLBBoo=";
};
nativeBuildInputs = [
pkgs/applications/virtualization/OVMF/default.nix
+9 -7
View File
@@ -29,6 +29,7 @@
x86_64 = "OvmfPkg/OvmfPkgX64.dsc";
aarch64 = "ArmVirtPkg/ArmVirtQemu.dsc";
riscv64 = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc";
loongarch64 = "OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc";
}.${stdenv.hostPlatform.parsed.cpu.name}
or (throw "Unsupported OVMF `projectDscPath` on ${stdenv.hostPlatform.parsed.cpu.name}")
, fwPrefix ? {
@@ -36,6 +37,7 @@
x86_64 = "OVMF";
aarch64 = "AAVMF";
riscv64 = "RISCV_VIRT";
loongarch64 = "LOONGARCH_VIRT";
}.${stdenv.hostPlatform.parsed.cpu.name}
or (throw "Unsupported OVMF `fwPrefix` on ${stdenv.hostPlatform.parsed.cpu.name}")
, metaPlatforms ? edk2.meta.platforms
@@ -84,8 +86,8 @@ let
in
assert platformSpecific ? ${cpuName};
assert msVarsTemplate -> fdSize4MB;
assert msVarsTemplate -> platformSpecific ? ${cpuName};
assert msVarsTemplate -> platformSpecific.${cpuName} ? msVarsArgs;
edk2.mkDerivation projectDscPath (finalAttrs: {
@@ -130,17 +132,17 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
export PYTHONPATH=$NIX_BUILD_TOP/debian/python:$PYTHONPATH
'';
postBuild = lib.optionalString stdenv.hostPlatform.isAarch ''
postBuild = lib.optionalString (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isLoongArch64) ''
(
cd ${buildPrefix}/FV
cp QEMU_EFI.fd ${fwPrefix}_CODE.fd
cp QEMU_VARS.fd ${fwPrefix}_VARS.fd
)
'' + lib.optionalString stdenv.hostPlatform.isAarch ''
# QEMU expects 64MiB CODE and VARS files on ARM/AARCH64 architectures
# Truncate the firmware files to the expected size
truncate -s 64M ${fwPrefix}_CODE.fd
truncate -s 64M ${fwPrefix}_VARS.fd
)
truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_CODE.fd
truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_VARS.fd
'' + lib.optionalString stdenv.hostPlatform.isRiscV ''
truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_CODE.fd
truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_VARS.fd
@@ -165,7 +167,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
postInstall = ''
mkdir -vp $fd/FV
'' + lib.optionalString (builtins.elem fwPrefix [
"OVMF" "AAVMF" "RISCV_VIRT"
"OVMF" "AAVMF" "RISCV_VIRT" "LOONGARCH_VIRT"
]) ''
mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV
'' + lib.optionalString stdenv.hostPlatform.isx86 ''
pkgs/build-support/rust/build-rust-package/default.nix
+17 -14
View File
@@ -150,21 +150,24 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
strictDeps = true;
meta = {
# default to Rust's platforms
platforms = rustc.meta.platforms ++ [
# Platforms without host tools from
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
"armv7a-darwin"
"armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux"
"mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux"
"armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd"
"x86_64-redox"
"wasm32-wasi"
];
badPlatforms = [
meta = meta // {
badPlatforms = meta.badPlatforms or [] ++ [
# Rust is currently unable to target the n32 ABI
lib.systems.inspect.patterns.isMips64n32
];
} // meta;
} // lib.optionalAttrs (rustc.meta ? platforms) {
# default to Rust's platforms
platforms = lib.intersectLists
meta.platforms or lib.platforms.all
(rustc.meta.platforms ++ [
# Platforms without host tools from
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
"armv7a-darwin"
"armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux"
"mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux"
"armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd"
"x86_64-redox"
"wasm32-wasi"
]);
};
})
pkgs/tools/misc/bmap-tools/default.nix → pkgs/by-name/bm/bmaptool/package.nix
+7 -7
View File
@@ -1,14 +1,14 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "bmap-tools";
version = "3.6";
pname = "bmaptool";
version = "3.8.0";
src = fetchFromGitHub {
owner = "intel";
repo = "bmap-tools";
owner = "yoctoproject";
repo = "bmaptool";
rev = "v${version}";
sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl";
sha256 = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I=";
};
propagatedBuildInputs = with python3Packages; [ six ];
@@ -17,8 +17,8 @@ python3Packages.buildPythonApplication rec {
doCheck = false;
meta = with lib; {
description = "bmap-related tools";
homepage = "https://github.com/intel/bmap-tools";
description = "BMAP Tools";
homepage = "https://github.com/yoctoproject/bmaptool";
license = licenses.gpl2Only;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
pkgs/by-name/ed/edk2/package.nix
+3 -1
View File
@@ -23,6 +23,8 @@ else if stdenv.isAarch64 then
"AARCH64"
else if stdenv.hostPlatform.isRiscV64 then
"RISCV64"
else if stdenv.hostPlatform.isLoongArch64 then
"LOONGARCH64"
else
throw "Unsupported architecture";
@@ -128,7 +130,7 @@ edk2 = stdenv.mkDerivation {
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/";
changelog = "https://github.com/tianocore/edk2/releases/tag/edk2-stable${edk2.version}";
license = lib.licenses.bsd2;
platforms = with lib.platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ riscv64;
platforms = with lib.platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ loongarch64 ++ riscv64;
maintainers = [ lib.maintainers.mjoerg ];
};
pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
+59
View File
@@ -0,0 +1,59 @@
From 9997ae55a47de469ea26f8437c30b51483abda5f Mon Sep 17 00:00:00 2001
From: Dan Klishch <danilklishch@gmail.com>
Date: Sat, 30 Sep 2023 23:38:05 -0400
Subject: Defer setting cursor position until the cursor is locked
---
src/wl_platform.h | 3 +++
src/wl_window.c | 14 ++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/wl_platform.h b/src/wl_platform.h
index ca34f66e..cd1f227f 100644
--- a/src/wl_platform.h
+++ b/src/wl_platform.h
@@ -403,6 +403,9 @@ typedef struct _GLFWwindowWayland
int scaleSize;
int compositorPreferredScale;
+ double askedCursorPosX, askedCursorPosY;
+ GLFWbool didAskForSetCursorPos;
+
struct zwp_relative_pointer_v1* relativePointer;
struct zwp_locked_pointer_v1* lockedPointer;
struct zwp_confined_pointer_v1* confinedPointer;
diff --git a/src/wl_window.c b/src/wl_window.c
index 1de26558..0df16747 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -2586,8 +2586,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos)
void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y)
{
- _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
- "Wayland: The platform does not support setting the cursor position");
+ window->wl.didAskForSetCursorPos = true;
+ window->wl.askedCursorPosX = x;
+ window->wl.askedCursorPosY = y;
}
void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode)
@@ -2819,6 +2820,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener =
static void lockedPointerHandleLocked(void* userData,
struct zwp_locked_pointer_v1* lockedPointer)
{
+ _GLFWwindow* window = userData;
+
+ if (window->wl.didAskForSetCursorPos)
+ {
+ window->wl.didAskForSetCursorPos = false;
+ zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer,
+ wl_fixed_from_double(window->wl.askedCursorPosX),
+ wl_fixed_from_double(window->wl.askedCursorPosY));
+ }
}
static void lockedPointerHandleUnlocked(void* userData,
--
2.42.0
pkgs/development/libraries/glfw/3.x.nix → pkgs/by-name/gl/glfw3/package.nix
+15 -8
View File
@@ -1,13 +1,16 @@
{ stdenv, lib, fetchFromGitHub, cmake
, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext
, Carbon, Cocoa, Kernel, fixDarwinDylibNames
, darwin, fixDarwinDylibNames
, extra-cmake-modules, wayland
, wayland-scanner, wayland-protocols, libxkbcommon, libdecor
, withMinecraftPatch ? false
}:
stdenv.mkDerivation rec {
let
version = "3.4";
pname = "glfw";
in
stdenv.mkDerivation {
pname = "glfw${lib.optionalString withMinecraftPatch "-minecraft"}";
inherit version;
src = fetchFromGitHub {
owner = "glfw";
@@ -17,16 +20,20 @@ stdenv.mkDerivation rec {
};
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
patches = ./x11.patch;
patches = [
./x11.patch
] ++ lib.optionals withMinecraftPatch [
./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
];
propagatedBuildInputs = [ libGL ];
nativeBuildInputs = [ cmake extra-cmake-modules ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]
++ lib.optionals stdenv.isLinux [ wayland-scanner ];
buildInputs =
lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ]
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa Kernel ])
++ lib.optionals stdenv.isLinux [
wayland
wayland-protocols
@@ -64,7 +71,7 @@ stdenv.mkDerivation rec {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
homepage = "https://www.glfw.org/";
license = licenses.zlib;
maintainers = with maintainers; [ marcweber twey ];
maintainers = with maintainers; [ marcweber Scrumplex twey ];
platforms = platforms.unix ++ platforms.windows;
};
}
pkgs/development/libraries/glfw/x11.patch → pkgs/by-name/gl/glfw3/x11.patch
View File
pkgs/applications/misc/liberasurecode/default.nix → pkgs/by-name/li/liberasurecode/package.nix
+32 -17
View File
@@ -1,34 +1,44 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, doxygen
, installShellFiles
, zlib
{
lib,
stdenv,
autoreconfHook,
doxygen,
fetchFromGitHub,
installShellFiles,
testers,
zlib,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "liberasurecode";
version = "1.6.3";
version = "1.6.4";
outputs = [ "out" "dev" "doc" ];
outputs = [
"out"
"dev"
"doc"
];
src = fetchFromGitHub {
owner = "openstack";
repo = pname;
rev = version;
sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU=";
repo = "liberasurecode";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-KYXlRjUudWhFbhyv9V1fmqwBw3/vTBfusxafaNG+Q40=";
};
postPatch = ''
substituteInPlace doc/doxygen.cfg.in \
--replace "GENERATE_MAN = NO" "GENERATE_MAN = YES"
--replace-fail "GENERATE_MAN = NO" "GENERATE_MAN = YES"
substituteInPlace Makefile.am src/Makefile.am \
--replace "-Werror" ""
--replace-fail "-Werror" ""
'';
nativeBuildInputs = [ autoreconfHook doxygen installShellFiles ];
nativeBuildInputs = [
autoreconfHook
doxygen
installShellFiles
];
buildInputs = [ zlib ];
@@ -47,10 +57,15 @@ stdenv.mkDerivation rec {
checkTarget = "test";
passthru.tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
meta = with lib; {
description = "Erasure Code API library written in C with pluggable Erasure Code backends";
homepage = "https://github.com/openstack/liberasurecode";
license = licenses.bsd2;
maintainers = teams.openstack.members;
pkgConfigModules = [ "erasurecode-1" ];
};
}
})
pkgs/by-name/li/lint-staged/package.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "lint-staged";
version = "15.2.9";
version = "15.2.10";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-qEqjB6GBzKx4zRqumMPSRxFnWQ4j+sBKWTspaeorL6Q=";
hash = "sha256-Mtr3PXV4pSQgtP+RkPmXpDgmW5hFo7a+xb2GAi+wFg4=";
};
npmDepsHash = "sha256-VQ8UDdPIrhiLvDfpAWLMvCtBIhW/LtRj/CC1j2yEm5o=";
npmDepsHash = "sha256-Br/KlvRkr+jFe8y2KEiE38FYrwgSbY5WpvwVOO4LGuQ=";
dontNpmBuild = true;
pkgs/by-name/lm/lmstudio/darwin.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM%20Studio-${version}-arm64.dmg";
hash = "sha256-8m+gLZqX1rz8kVxEo880FKvU046juaO2DneeBg7Sc70=";
hash = "sha256-KC4nXhMkrRDRtLPnpD5UTyKzQ+xH9jhZZHnjk9gDVfo=";
};
nativeBuildInputs = [ undmg ];
pkgs/by-name/lm/lmstudio/linux.nix
+1 -1
View File
@@ -7,7 +7,7 @@
let
src = fetchurl {
url = "https://releases.lmstudio.ai/linux/x86/${version}/LM_Studio-${version}.AppImage";
hash = "sha256-zkTSa0wgKcyKywnIZPF0b6ZzKtyHn3hqjrQPgILF0eI=";
hash = "sha256-w+g7/YezpOr/mBNZbmtLMPt3xTRDIHgGTSroo6mRXxw=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
pkgs/by-name/lm/lmstudio/package.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}:
let
pname = "lmstudio";
version = "0.3.1";
version = "0.3.2";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
homepage = "https://lmstudio.ai/";
pkgs/by-name/no/nomacs/package.nix
+1
View File
@@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
# see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277
(lib.getOutput "cxxdev" opencv4)
] ++ (with libsForQt5; [
kimageformats
qtbase
qtimageformats
qtsvg
pkgs/by-name/pr/prismlauncher/package.nix
+24 -51
View File
@@ -1,30 +1,33 @@
{
lib,
stdenv,
symlinkJoin,
prismlauncher-unwrapped,
addDriverRunpath,
alsa-lib,
flite,
gamemode,
glfw,
glfw-wayland-minecraft,
mesa-demos,
jdk8,
glfw3-minecraft,
jdk17,
jdk21,
jdk8,
kdePackages,
lib,
libGL,
libX11,
libXcursor,
libXext,
libXrandr,
libXxf86vm,
libjack2,
libpulseaudio,
libusb1,
makeWrapper,
mesa-demos,
openal,
pciutils,
pipewire,
prismlauncher-unwrapped,
stdenv,
symlinkJoin,
udev,
vulkan-loader,
xorg,
xrandr,
additionalLibs ? [ ],
additionalPrograms ? [ ],
@@ -37,15 +40,6 @@
],
msaClientID ? null,
textToSpeechSupport ? stdenv.isLinux,
# Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
# when launched on wayland, allowing for the game to be run natively.
# Make sure to enable "Use system installation of GLFW" in instance settings
# for this to take effect
#
# Warning: This build of glfw may be unstable, and the launcher
# itself can take slightly longer to start
withWaylandGLFW ? false,
}:
assert lib.assertMsg (
@@ -56,10 +50,6 @@ assert lib.assertMsg (
textToSpeechSupport -> stdenv.isLinux
) "textToSpeechSupport only has an effect on Linux.";
assert lib.assertMsg (
withWaylandGLFW -> stdenv.isLinux
) "withWaylandGLFW is only available on Linux.";
let
prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; };
in
@@ -69,11 +59,7 @@ symlinkJoin {
paths = [ prismlauncher' ];
nativeBuildInputs =
[ kdePackages.wrapQtAppsHook ]
# purposefully using a shell wrapper here for variable expansion
# see https://github.com/NixOS/nixpkgs/issues/172583
++ lib.optional withWaylandGLFW makeWrapper;
nativeBuildInputs = [ kdePackages.wrapQtAppsHook ];
buildInputs =
[
@@ -84,30 +70,17 @@ symlinkJoin {
lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux
) kdePackages.qtwayland;
env = {
waylandPreExec = lib.optionalString withWaylandGLFW ''
if [ -n "$WAYLAND_DISPLAY" ]; then
export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
fi
'';
};
postBuild =
lib.optionalString withWaylandGLFW ''
qtWrapperArgs+=(--run "$waylandPreExec")
''
+ ''
wrapQtAppsHook
'';
postBuild = ''
wrapQtAppsHook
'';
qtWrapperArgs =
let
runtimeLibs =
[
# lwjgl
stdenv.cc.cc.lib
## native versions
glfw
glfw3-minecraft
openal
## openal
@@ -118,11 +91,11 @@ symlinkJoin {
## glfw
libGL
xorg.libX11
xorg.libXext
xorg.libXcursor
xorg.libXrandr
xorg.libXxf86vm
libX11
libXcursor
libXext
libXrandr
libXxf86vm
udev # oshi
@@ -136,7 +109,7 @@ symlinkJoin {
runtimePrograms = [
mesa-demos
pciutils # need lspci
xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
] ++ additionalPrograms;
in
pkgs/by-name/re/renode-dts2repl/package.nix
+3 -3
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication {
pname = "renode-dts2repl";
version = "0-unstable-2024-08-20";
version = "0-unstable-2024-08-30";
pyproject = true;
src = fetchFromGitHub {
owner = "antmicro";
repo = "dts2repl";
rev = "ca0e43957140ee0cd7795b7a42ffb04fdcb98328";
hash = "sha256-6SgnYFta9FgHhc6Da1ItFO/UK2UtXU14bTl+sjX0I9s=";
rev = "231e1330c3210d31f08bf739ef69f096f0732291";
hash = "sha256-oD67tMJ23FBZzELtTdFZ2E7AtKs9m3T6L1rRuibfvY8=";
};
nativeBuildInputs = [
pkgs/by-name/sw/swaylock-effects/package.nix
+1
View File
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
'';
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner];
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
pkgs/development/compilers/cairo/default.nix
+12 -3
View File
@@ -2,20 +2,26 @@
, rustPlatform
, fetchFromGitHub
, rustfmt
, perl
}:
rustPlatform.buildRustPackage rec {
pname = "cairo";
version = "2.5.4";
version = "2.8.0";
src = fetchFromGitHub {
owner = "starkware-libs";
repo = "cairo";
rev = "v${version}";
hash = "sha256-ctb5VingMczzHLyyEjKgFKNAZI3/fqzjFW/RQGDSsyQ=";
hash = "sha256-zQ+kc4c8YI9vURUEQNqX55mTJBcc2NLp4K8kab3ZjEs=";
};
cargoHash = "sha256-T21GuGQaX/VD907MEGp68bQPXrRK0it4o1nLEdHwTsE=";
cargoHash = "sha256-3ah6cHyCppkLJ2e73aGhVemyMRBl9R5a6ufWHmrJHSk=";
# openssl crate requires perl during build process
nativeBuildInputs = [
perl
];
nativeCheckInputs = [
rustfmt
@@ -24,6 +30,9 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
# Requires a mythical rustfmt 2.0 or a nightly compiler
"--skip=golden_test::sourcegen_ast"
# Test broken
"--skip=test_lowering_consistency"
];
postInstall = ''
pkgs/development/compilers/llvm/common/common-let.nix
+2 -1
View File
@@ -22,7 +22,8 @@ rec {
lib.platforms.wasi ++
lib.platforms.x86 ++
lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv ++
lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k;
lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k ++
lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64;
};
releaseInfo =
pkgs/development/interpreters/bwbasic/default.nix
+19 -10
View File
@@ -1,15 +1,24 @@
{ lib, stdenv, dos2unix, fetchurl, unzip }:
{
lib,
gccStdenv,
dos2unix,
fetchurl,
unzip,
}:
stdenv.mkDerivation rec {
gccStdenv.mkDerivation (finalAttrs: {
pname = "bwbasic";
version = "3.20";
src = fetchurl {
url = "mirror://sourceforge/project/bwbasic/bwbasic/version%203.20/bwbasic-3.20.zip";
sha256 = "1w9r4cl7z1lh52c1jpjragbspi1qn0zb7jhcsldav4gdnzxfw67f";
url = "mirror://sourceforge/project/bwbasic/bwbasic/version%20${finalAttrs.version}/bwbasic-${finalAttrs.version}.zip";
hash = "sha256-7hju+rftka0a1QzKsz6wOMSr11NZXhmYKJCGfygjOfE=";
};
nativeBuildInputs = [ dos2unix unzip ];
nativeBuildInputs = [
dos2unix
unzip
];
unpackPhase = ''
unzip $src
@@ -27,12 +36,12 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
'';
meta = with lib; {
meta = {
description = "Bywater BASIC Interpreter";
mainProgram = "bwbasic";
license = licenses.gpl2Only;
maintainers = with maintainers; [ irenes ];
platforms = platforms.all;
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ irenes ];
platforms = lib.platforms.all;
homepage = "https://sourceforge.net/projects/bwbasic/";
};
}
})
pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix
-64
View File
@@ -1,64 +0,0 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch2, cmake, extra-cmake-modules
, libGL, wayland, wayland-protocols, libxkbcommon, libdecor
}:
stdenv.mkDerivation {
version = "unstable-2023-06-01";
pname = "glfw-wayland-minecraft";
src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
rev = "3eaf1255b29fdf5c2895856c7be7d7185ef2b241";
sha256 = "sha256-UnwuE/3q6I4dS5syagpnqrDEVDK9XSVdyOg7KNkdUUA=";
};
patches = [
(fetchpatch2 {
url = "https://raw.githubusercontent.com/Admicos/minecraft-wayland/15f88a515c63a9716cfdf4090fab8e16543f4ebd/0003-Don-t-crash-on-calls-to-focus-or-icon.patch";
hash = "sha256-NZbKh16h+tWXXnz13QcFBFaeGXMNxZKGQb9xJEahFnE=";
})
(fetchpatch2 {
url = "https://raw.githubusercontent.com/Admicos/minecraft-wayland/15f88a515c63a9716cfdf4090fab8e16543f4ebd/0005-Add-warning-about-being-an-unofficial-patch.patch";
hash = "sha256-QMUNlnlCeFz5gIVdbM+YXPsrmiOl9cMwuVRSOvlw+T0=";
})
];
propagatedBuildInputs = [ libGL ];
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ wayland wayland-protocols libxkbcommon ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DGLFW_BUILD_WAYLAND=ON"
"-DGLFW_BUILD_X11=OFF"
"-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'"
];
postPatch = ''
substituteInPlace src/wl_init.c \
--replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0"
substituteInPlace src/wl_init.c \
--replace "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0"
substituteInPlace src/wl_init.c \
--replace "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0"
substituteInPlace src/wl_init.c \
--replace "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0"
substituteInPlace src/wl_init.c \
--replace "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1"
'';
meta = with lib; {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time - with patches to support Minecraft on Wayland";
homepage = "https://www.glfw.org/";
license = licenses.zlib;
maintainers = with maintainers; [ Scrumplex ];
platforms = platforms.linux;
};
}
pkgs/development/libraries/glfw/wayland.patch
-25
View File
@@ -1,25 +0,0 @@
From 46fb81c69e8acdb70907409f98dd01e387408414 Mon Sep 17 00:00:00 2001
From: Stone Tickle <lattis@mochiro.moe>
Date: Fri, 5 Jun 2020 12:51:25 +0900
Subject: [PATCH] set O_NONBLOCK on repeat timerfd
---
src/wl_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/wl_init.c b/src/wl_init.c
index 49e7cc52..43569bef 100644
--- a/src/wl_init.c
+++ b/src/wl_init.c
@@ -1166,7 +1166,7 @@ int _glfwPlatformInit(void)
_glfw.wl.timerfd = -1;
if (_glfw.wl.seatVersion >= 4)
- _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
+ _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK);
if (_glfw.wl.pointer && _glfw.wl.shm)
{
--
2.31.1
pkgs/development/libraries/mesa/common.nix
+1 -5
View File
@@ -29,11 +29,7 @@ rec {
homepage = "https://www.mesa3d.org/";
changelog = "https://www.mesa3d.org/relnotes/${version}.html";
license = with lib.licenses; [ mit ]; # X11 variant, in most files
platforms = [
"i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux"
"armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux"
"powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux"
];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :)
};
}
pkgs/development/libraries/mesa/default.nix
+3 -3
View File
@@ -40,7 +40,7 @@
, xorg
, zstd
, enablePatentEncumberedCodecs ? true
, enableValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light
, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light
, galliumDrivers ? [
"d3d12" # WSL emulated GPU (aka Dozen)
@@ -215,7 +215,7 @@ in stdenv.mkDerivation {
# meson auto_features enables this, but we do not want it
(lib.mesonEnable "android-libbacktrace" false)
(lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
(lib.mesonEnable "valgrind" enableValgrind)
(lib.mesonEnable "valgrind" withValgrind)
] ++ lib.optionals enablePatentEncumberedCodecs [
(lib.mesonOption "video-codecs" "all")
] ++ lib.optionals needNativeCLC [
@@ -255,7 +255,7 @@ in stdenv.mkDerivation {
xcbutilkeysyms
xorgproto
zstd
] ++ lib.optionals enableValgrind [
] ++ lib.optionals withValgrind [
valgrind-light
];
pkgs/development/libraries/simdjson/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
version = "3.10.0";
version = "3.10.1";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
sha256 = "sha256-MKaYThfAbQiUHBFPAWJatKdLJdmJfsR3o8gp81RE3SI=";
sha256 = "sha256-UfGt5lKmpqc21Hln4t/4KJfg+3V/hqX3UYgpCvlhkrM=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/lisp-modules/ql.nix
-3
View File
@@ -250,9 +250,6 @@ let
libusb-ffi = super.libusb-ffi.overrideLispAttrs (o: {
nativeLibs = [ pkgs.libusb-compat-0_1 ];
});
cl-fam = super.cl-fam.overrideLispAttrs (o: {
nativeLibs = [ pkgs.fam ];
});
jpeg-turbo = super.jpeg-turbo.overrideLispAttrs (o: {
nativeLibs = [ pkgs.libjpeg_turbo ];
});
pkgs/development/misc/haskell/changelog-d/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
}:
mkDerivation rec {
pname = "changelog-d";
version = "1.0";
version = "1.0.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "fgaz";
repo = "changelog-d";
rev = "v${version}";
hash = "sha256-cXczIJb5z+Obq13F90oWcgSN1JAVqRWWw4jp2HT5G5Y=";
hash = "sha256-4TbZD4pXP/5q+t3rTcdCsY5APWIcxhCMM+WsNO/6ke4=";
};
isLibrary = false;
isExecutable = true;
pkgs/development/ocaml-modules/menhir/lib.nix
+8 -2
View File
@@ -1,8 +1,14 @@
{ lib, buildDunePackage, coqPackages, version ? "20231231" }:
{ lib
, buildDunePackage
, ocaml
, coqPackages
, version ? if lib.versionAtLeast ocaml.version "4.08" then "20240715" else "20231231"
}:
let fetched = coqPackages.metaFetch ({
release."20231231".sha256 = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk=";
releaseRev = v: "v${v}";
release."20240715".sha256 = "sha256-9CSxAIm0aEXkwF+aj8u/bqLG30y5eDNz65EnohJPjzI=";
releaseRev = v: "${v}";
location = { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "menhir"; };
}) version;
in
pkgs/development/python-modules/aio-georss-client/default.nix
+5 -5
View File
@@ -17,23 +17,23 @@
buildPythonPackage rec {
pname = "aio-georss-client";
version = "0.12";
version = "0.13";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-georss-client";
rev = "refs/tags/v${version}";
hash = "sha256-qs0/TkGZlwsucnkgCBco2Pqr9mf5fZHY7ikMBKff+gA=";
hash = "sha256-2qo5G/L2yh/6IXswkOyrCYnBNLDLx3EOpR53lnnpNOo=";
};
__darwinAllowLocalNetworking = true;
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
aiohttp
haversine
xmltodict
pkgs/development/python-modules/aio-georss-gdacs/default.nix
+7 -7
View File
@@ -3,35 +3,35 @@
aio-georss-client,
aioresponses,
buildPythonPackage,
dateparser,
fetchFromGitHub,
pytest-asyncio,
pytestCheckHook,
python-dateutil,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "aio-georss-gdacs";
version = "0.9";
version = "0.10";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-georss-gdacs";
rev = "refs/tags/v${version}";
hash = "sha256-B0qVCh2u0WleF0iv0o1/d5UIS2kbYCAqCgmNHyCpJ8Q=";
hash = "sha256-PhOI0v3dKTNGZLk1/5wIgvQkm4Cwfr1UYilr5rW7e3g=";
};
__darwinAllowLocalNetworking = true;
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
aio-georss-client
dateparser
python-dateutil
];
nativeCheckInputs = [
pkgs/development/python-modules/aioairzone-cloud/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aioairzone-cloud";
version = "0.6.3";
version = "0.6.5";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = "aioairzone-cloud";
rev = "refs/tags/${version}";
hash = "sha256-0F7x/A7kjtFAA6FBZXAD+Ugfkvh5ZfPFoU/emGmogD8=";
hash = "sha256-+F1kcs3XBBRNSmiuobFIFHsZOHEFjwYq0oxkHViuWXw=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/aiolifx/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "aiolifx";
version = "1.0.8";
version = "1.0.9";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-GbChqlBOcrDvzwrY0Vd6TTqPOhUjKbcYtULdQDVsY2o=";
hash = "sha256-x2wzFXehwLZWkRsBv54kYa7aon02saZpBIIA1J+9Fdc=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/aiopulse/default.nix
+5 -5
View File
@@ -4,24 +4,24 @@
buildPythonPackage,
fetchPypi,
pythonOlder,
setuptools,
hatchling,
}:
buildPythonPackage rec {
pname = "aiopulse";
version = "0.4.5";
version = "0.4.6";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-yrltqnePNnNwsVGkfXgtrtL/FuazRvmoVL4L0H4j4Bg=";
hash = "sha256-juubQHAAQYN9mSssfF3prYByy+wxscZFxwgspJU8zYA=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ hatchling ];
propagatedBuildInputs = [ async-timeout ];
dependencies = [ async-timeout ];
# Tests are not present
doCheck = false;
pkgs/development/python-modules/aioruckus/default.nix
+4 -2
View File
@@ -1,6 +1,7 @@
{
lib,
aiohttp,
aioresponses,
buildPythonPackage,
cryptography,
fetchFromGitHub,
@@ -13,7 +14,7 @@
buildPythonPackage rec {
pname = "aioruckus";
version = "0.40";
version = "0.41";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
owner = "ms264556";
repo = "aioruckus";
rev = "refs/tags/v${version}";
hash = "sha256-oEm0+ktEJHJPg4PUPfSmG9SyVRDrxs7kosQ0tIY+bRc=";
hash = "sha256-acu0EWP/k0qyylPtM8IBxhJhhQhXpbG2NheYpD8RTG8=";
};
postPatch = ''
@@ -39,6 +40,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
aioresponses
pytest-asyncio
pytestCheckHook
];
pkgs/development/python-modules/coinmetrics-api-client/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "coinmetrics-api-client";
version = "2024.8.16.10";
version = "2024.8.20.13";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "coinmetrics_api_client";
hash = "sha256-HYNmDN3gzmQ7gcUSSXI7/TwDDFPDZJUSu9P0Xz1z2Tk=";
hash = "sha256-IBfHHAmT1BTgA6eMkZf8ggfiknNYp7mfELSRyFARWNk=";
};
pythonRelaxDeps = [ "typer" ];
pkgs/development/python-modules/ghapi/default.nix
+8 -4
View File
@@ -5,12 +5,13 @@
fastcore,
packaging,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "ghapi";
version = "1.0.3";
format = "setuptools";
version = "1.0.6";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,10 +19,12 @@ buildPythonPackage rec {
owner = "fastai";
repo = "ghapi";
rev = "refs/tags/${version}";
hash = "sha256-nH3OciLhet4620WAEmm8mUAmlnpniyIsF2oIzqbZ7FI=";
hash = "sha256-ii19wuFAxMiGce37TNXRNSdvMcGWQjCfPukeqxySYnc=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
fastcore
packaging
];
@@ -34,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python interface to GitHub's API";
homepage = "https://github.com/fastai/ghapi";
changelog = "https://github.com/fastai/ghapi/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/mkdocs-autorefs/default.nix
+5 -5
View File
@@ -11,8 +11,8 @@
buildPythonPackage rec {
pname = "mkdocs-autorefs";
version = "1.1.0";
format = "pyproject";
version = "1.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = "autorefs";
rev = "refs/tags/${version}";
hash = "sha256-quN5Ow5mEQ1o5RGYVCcFLrMG9bl51Mg/hrc+VR/SVwM=";
hash = "sha256-C1ca7tx9s88U7Xp/bd3KhlWeb32a612RyCVBQz0vJ1g=";
};
postPatch = ''
@@ -28,9 +28,9 @@ buildPythonPackage rec {
--replace 'dynamic = ["version"]' 'version = "${version}"'
'';
nativeBuildInputs = [ pdm-backend ];
build-system = [ pdm-backend ];
propagatedBuildInputs = [
dependencies = [
markdown
mkdocs
];
pkgs/development/python-modules/pyeclib/default.nix
+20 -8
View File
@@ -2,32 +2,41 @@
lib,
stdenv,
buildPythonPackage,
distutils,
fetchFromGitHub,
liberasurecode,
pytestCheckHook,
setuptools,
six,
}:
buildPythonPackage rec {
pname = "pyeclib";
version = "unstable-2022-03-11";
format = "setuptools";
version = "1.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "openstack";
repo = "pyeclib";
rev = "b50040969a03f7566ffcb468336e875d21486113";
hash = "sha256-nYYjocStC0q/MC6pum3J4hlXiu/R5xODwIE97Ho3iEY=";
rev = "refs/tags/${version}";
hash = "sha256-pa3majZ68+DQGtgGCpZVRshof+w9jvpxreo4dkckLXk=";
};
postPatch = ''
# patch dlopen call
substituteInPlace src/c/pyeclib_c/pyeclib_c.c \
--replace "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so"
--replace-fail "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so"
# python's platform.platform() doesn't return "Darwin" (anymore?)
substituteInPlace setup.py \
--replace '"Darwin"' '"macOS"'
--replace-fail '"Darwin"' '"macOS"'
'';
build-system = [
distutils
setuptools
];
preBuild =
let
ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
@@ -37,9 +46,12 @@ buildPythonPackage rec {
export ${ldLibraryPathEnvName}="${lib.makeLibraryPath [ liberasurecode ]}"
'';
buildInputs = [ liberasurecode ];
dependencies = [ liberasurecode ];
nativeCheckInputs = [ six ];
nativeCheckInputs = [
pytestCheckHook
six
];
pythonImportsCheck = [ "pyeclib" ];
pkgs/development/python-modules/pysqueezebox/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysqueezebox";
version = "0.7.1";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "rajlaud";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-WnL9Va3uaWlUHVBtit4v+XdYOFmPpxG91mAHEGwI+7c=";
hash = "sha256-d+8/YyA6tTBxZpiR9pu/5K1v0FOiSrR7RZ7MMBwOzdA=";
};
propagatedBuildInputs = [ aiohttp ];
pkgs/development/python-modules/python-telegram-bot/default.nix
+9 -5
View File
@@ -36,18 +36,22 @@ buildPythonPackage rec {
hash = "sha256-i1YEcN615xeI4HcygXV9kzuXpT2yDSnlNU6bZqu1dPM=";
};
build-system = [ setuptools hatchling ];
dependencies = [
httpx
build-system = [
setuptools
hatchling
];
dependencies = [ httpx ];
optional-dependencies = rec {
all = ext ++ http2 ++ passport ++ socks;
callback-data = [ cachetools ];
ext = callback-data ++ job-queue ++ rate-limiter ++ webhooks;
http2 = httpx.optional-dependencies.http2;
job-queue = [ apscheduler pytz ];
job-queue = [
apscheduler
pytz
];
passport = [ cryptography ] ++ lib.optionals (pythonAtLeast "3.13") [ cffi ];
rate-limiter = [ aiolimiter ];
socks = httpx.optional-dependencies.socks;
pkgs/development/python-modules/stamina/default.nix
+3 -3
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "stamina";
version = "24.2.0";
version = "24.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "hynek";
repo = "stamina";
rev = version;
hash = "sha256-gn8kbLLj+wMPtIwnsOdKDEhBsLApkl3K6mf/bQT3qT8=";
rev = "refs/tags/${version}";
hash = "sha256-DasubVqKRhX4CRyKyJ3fIA9Rxmy+kGxkW0pDdu8OPPo=";
};
nativeBuildInputs = [
pkgs/development/python-modules/webdataset/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
}:
buildPythonPackage rec {
pname = "webdataset";
version = "0.2.96";
version = "0.2.100";
pyproject = true;
src = fetchFromGitHub {
owner = "webdataset";
repo = "webdataset";
rev = "refs/tags/${version}";
hash = "sha256-Wz6dLi2xW9aF+QjDx4yn64zU7u7SCyDXVKkS+1TyYaU=";
hash = "sha256-+Rvb4VY4qBcVKM1CUkLZTQdlZklpHcuiMO8r6VNInLc=";
};
build-system = [
pkgs/development/tools/analysis/checkov/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.239";
version = "3.2.241";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-Y746ZwkLS6S682mnMSq30tQgFiZJduEkh3ZeOTf8V1E=";
hash = "sha256-h6Qwpi5wH+kGms2aRgzpshevsY1ry4DPMRD+N56nZbU=";
};
patches = [ ./flake8-compat-5.x.patch ];
pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "ibus-table";
version = "1.17.6";
version = "1.17.7";
src = fetchFromGitHub {
owner = "kaio";
repo = "ibus-table";
rev = version;
sha256 = "sha256-rbtyixsDMIQAP2TLqp1KbcCUMc7cKvGQR27puJmbLno=";
sha256 = "sha256-oofn/P3iY6dtrtS4VkoH3i21IRtIlVDyF8D+v2n+PgU=";
};
postPatch = ''
pkgs/tools/nix/nixos-option/src/nixos-option.cc
+1 -1
View File
@@ -465,7 +465,7 @@ void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr
v.print(ctx.state.symbols, out.ostream);
}
} catch (ThrownError & e) {
if (e.msg() == "The option `" + path + "' is used but not defined.") {
if (e.msg() == "The option `" + path + "' was accessed but has no value defined. Try setting the option.") {
// 93% of errors are this, and just letting this message through would be
// misleading. These values may or may not actually be "used" in the
// config. The thing throwing the error message assumes that if anything
pkgs/top-level/aliases.nix
+2
View File
@@ -171,6 +171,7 @@ mapAliases ({
(lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30
blockbench-electron = blockbench; # Added 2024-03-16
bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10
bmap-tools = bmaptool; # Added 2024-08-05
bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01
boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08
boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08
@@ -529,6 +530,7 @@ mapAliases ({
glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26
glfw-wayland = glfw; # Added 2024-04-19
glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
glxinfo = mesa-demos; # Added 2024-07-04
gmailieer = lieer; # Added 2020-04-19
gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02
pkgs/top-level/all-packages.nix
+3 -7
View File
@@ -3409,8 +3409,6 @@ with pkgs;
blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
bmap-tools = callPackage ../tools/misc/bmap-tools { };
bolliedelayxt-lv2 = callPackage ../applications/audio/bolliedelayxt.lv2 { };
bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
@@ -19919,8 +19917,6 @@ with pkgs;
libesmtp = callPackage ../development/libraries/libesmtp { };
liberasurecode = callPackage ../applications/misc/liberasurecode { };
example-robot-data = callPackage ../development/libraries/example-robot-data { };
exiv2 = callPackage ../development/libraries/exiv2 { };
@@ -20251,10 +20247,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AGL OpenGL;
};
glfw = glfw3;
glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {};
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
glfw3 = callPackage ../development/libraries/glfw/3.x.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel;
glfw3-minecraft = callPackage ../by-name/gl/glfw3/package.nix {
withMinecraftPatch = true;
};
glibc = callPackage ../development/libraries/glibc {