Merge master into staging-next
This commit is contained in:
@@ -4992,7 +4992,7 @@
|
||||
githubId = 15233006;
|
||||
};
|
||||
connorbaker = {
|
||||
email = "connor.baker@tweag.io";
|
||||
email = "ConnorBaker01@gmail.com";
|
||||
matrix = "@connorbaker:matrix.org";
|
||||
github = "ConnorBaker";
|
||||
name = "Connor Baker";
|
||||
@@ -18552,12 +18552,6 @@
|
||||
githubId = 16345849;
|
||||
name = "Parthiv Seetharaman";
|
||||
};
|
||||
paddygord = {
|
||||
email = "pgpatrickgordon@gmail.com";
|
||||
github = "avagordon01";
|
||||
githubId = 10776658;
|
||||
name = "Patrick Gordon";
|
||||
};
|
||||
paepcke = {
|
||||
email = "git@paepcke.de";
|
||||
github = "paepckehh";
|
||||
|
||||
@@ -99,7 +99,7 @@ rec {
|
||||
Defines how unit configuration is provided for systemd:
|
||||
|
||||
`asDropinIfExists` creates a unit file when no unit file is provided by the package
|
||||
otherwise a drop-in file name `overrides.conf`.
|
||||
otherwise it creates a drop-in file named `overrides.conf`.
|
||||
|
||||
`asDropin` creates a drop-in file named `overrides.conf`.
|
||||
Mainly needed to define instances for systemd template units (e.g. `systemd-nspawn@mycontainer.service`).
|
||||
|
||||
@@ -159,8 +159,8 @@ let
|
||||
|
||||
# programs.firefox.enable = true;
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# \$ nix search wget
|
||||
# List packages installed in system profile.
|
||||
# You can use https://search.nixos.org/ to find more packages (and options).
|
||||
# environment.systemPackages = with pkgs; [
|
||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||
# wget
|
||||
|
||||
@@ -55,10 +55,6 @@ let
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
packages = lib.unique (map toString udevPackages);
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgs.systemdMinimal
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir -p $out
|
||||
@@ -151,11 +147,6 @@ let
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Verify all the udev rules
|
||||
echo "Verifying udev rules using udevadm verify..."
|
||||
udevadm verify --resolve-names=never --no-style $out
|
||||
echo "OK"
|
||||
|
||||
# If auto-configuration is disabled, then remove
|
||||
# udev's 80-drivers.rules file, which contains rules for
|
||||
# automatically calling modprobe.
|
||||
|
||||
@@ -74,9 +74,9 @@ let
|
||||
};
|
||||
|
||||
installSecrets =
|
||||
source: target: secrets:
|
||||
source: target: owner: secrets:
|
||||
pkgs.writeShellScript "installSecrets.sh" ''
|
||||
install -m0600 -D ${source} "${target}"
|
||||
install -m0600 -o${owner} -D ${source} "${target}"
|
||||
${lib.concatLines (
|
||||
lib.forEach secrets (name: ''
|
||||
${pkgs.replace-secret}/bin/replace-secret \
|
||||
@@ -327,6 +327,23 @@ let
|
||||
description = "Whether to enable `upsmon`.";
|
||||
};
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "nutmon";
|
||||
description = ''
|
||||
User to run `upsmon` as. `upsmon.conf` will have its owner set to this
|
||||
user. If not specified, a default user will be created.
|
||||
'';
|
||||
};
|
||||
group = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "nutmon";
|
||||
description = ''
|
||||
Group for the default `nutmon` user. If the default user is created
|
||||
and this is not specified, a default group will be created.
|
||||
'';
|
||||
};
|
||||
|
||||
monitor = lib.mkOption {
|
||||
type = with lib.types; attrsOf (submodule monitorOptions);
|
||||
default = { };
|
||||
@@ -344,7 +361,6 @@ let
|
||||
MONITOR = <generated from config.power.ups.upsmon.monitor>
|
||||
NOTIFYCMD = "''${pkgs.nut}/bin/upssched";
|
||||
POWERDOWNFLAG = "/run/killpower";
|
||||
RUN_AS_USER = "root";
|
||||
SHUTDOWNCMD = "''${pkgs.systemd}/bin/shutdown now";
|
||||
}
|
||||
'';
|
||||
@@ -382,7 +398,6 @@ let
|
||||
);
|
||||
NOTIFYCMD = lib.mkDefault "${pkgs.nut}/bin/upssched";
|
||||
POWERDOWNFLAG = lib.mkDefault "/run/killpower";
|
||||
RUN_AS_USER = "root"; # TODO: replace 'root' by another username.
|
||||
SHUTDOWNCMD = lib.mkDefault "${pkgs.systemd}/bin/shutdown now";
|
||||
};
|
||||
};
|
||||
@@ -581,7 +596,7 @@ in
|
||||
systemd.services.upsmon =
|
||||
let
|
||||
secrets = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}") cfg.upsmon.monitor;
|
||||
createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" secrets;
|
||||
createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" cfg.upsmon.user secrets;
|
||||
in
|
||||
{
|
||||
enable = cfg.upsmon.enable;
|
||||
@@ -591,7 +606,7 @@ in
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStartPre = "${createUpsmonConf}";
|
||||
ExecStart = "${pkgs.nut}/sbin/upsmon";
|
||||
ExecStart = "${pkgs.nut}/sbin/upsmon -u ${cfg.upsmon.user}";
|
||||
ExecReload = "${pkgs.nut}/sbin/upsmon -c reload";
|
||||
LoadCredential = lib.mapAttrsToList (
|
||||
name: monitor: "upsmon_password_${name}:${monitor.passwordFile}"
|
||||
@@ -604,7 +619,7 @@ in
|
||||
systemd.services.upsd =
|
||||
let
|
||||
secrets = lib.mapAttrsToList (name: user: "upsdusers_password_${name}") cfg.users;
|
||||
createUpsdUsers = installSecrets upsdUsers "/run/nut/upsd.users" secrets;
|
||||
createUpsdUsers = installSecrets upsdUsers "/run/nut/upsd.users" "root" secrets;
|
||||
in
|
||||
{
|
||||
enable = cfg.upsd.enable;
|
||||
@@ -696,18 +711,11 @@ in
|
||||
|
||||
services.udev.packages = [ pkgs.nut ];
|
||||
|
||||
/*
|
||||
users.users.nut =
|
||||
{ uid = 84;
|
||||
home = "/var/lib/nut";
|
||||
createHome = true;
|
||||
group = "nut";
|
||||
description = "UPnP A/V Media Server user";
|
||||
};
|
||||
|
||||
users.groups."nut" =
|
||||
{ gid = 84; };
|
||||
*/
|
||||
users.users.nutmon = lib.mkIf (cfg.upsmon.user == "nutmon") {
|
||||
isSystemUser = true;
|
||||
group = cfg.upsmon.group;
|
||||
};
|
||||
users.groups.nutmon = lib.mkIf (cfg.upsmon.user == "nutmon" && cfg.upsmon.group == "nutmon") { };
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@@ -228,11 +228,11 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
AutoUpdate.Enable = lib.mkOption {
|
||||
AutoUpdate.UpdateToLatestVersion = lib.mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether or not to enable autoupdate for goal state processing.
|
||||
Whether or not to enable auto-update of the Extension Handler.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@@ -38,9 +38,9 @@
|
||||
machine.wait_for_unit("systemd-zram-setup@zram0.service")
|
||||
machine.wait_for_unit("systemd-zram-setup@zram1.service")
|
||||
zram = machine.succeed("zramctl --noheadings --raw")
|
||||
swap = machine.succeed("swapon --show --noheadings")
|
||||
swap = machine.succeed("swapon --show --noheadings --raw")
|
||||
for i in range(2):
|
||||
assert f"/dev/zram{i} lz4 10M" in zram
|
||||
assert f"/dev/zram{i} partition 10M" in swap
|
||||
assert f"/dev/zram{i} partition 10M" in swap
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -14545,6 +14545,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
timerly = buildVimPlugin {
|
||||
pname = "timerly";
|
||||
version = "2025-04-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvzone";
|
||||
repo = "timerly";
|
||||
rev = "17299a4d332c483ce09052fe8478b41b992f2594";
|
||||
sha256 = "0nfyw98nb95df0dpnxlaipgar92b8z2z3rxfih2fc86m6gxv2mm2";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvzone/timerly/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
timestamp-vim = buildVimPlugin {
|
||||
pname = "timestamp.vim";
|
||||
version = "2010-11-06";
|
||||
|
||||
@@ -3353,6 +3353,10 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
timerly = super.timerly.overrideAttrs {
|
||||
dependencies = [ self.nvzone-volt ];
|
||||
};
|
||||
|
||||
tmux-complete-vim = super.tmux-complete-vim.overrideAttrs {
|
||||
# Vim plugin with optional nvim-compe lua module
|
||||
nvimSkipModules = [ "compe_tmux" ];
|
||||
|
||||
@@ -1116,6 +1116,7 @@ https://github.com/johmsalas/text-case.nvim/,HEAD,
|
||||
https://github.com/vhsconnect/themed-tabs.nvim/,HEAD,
|
||||
https://github.com/ron89/thesaurus_query.vim/,,
|
||||
https://github.com/itchyny/thumbnail.vim/,,
|
||||
https://github.com/nvzone/timerly/,HEAD,
|
||||
https://github.com/vim-scripts/timestamp.vim/,,
|
||||
https://github.com/levouh/tint.nvim/,HEAD,
|
||||
https://github.com/tinted-theming/tinted-vim/,HEAD,
|
||||
|
||||
@@ -90,13 +90,13 @@
|
||||
"vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-ZSbanDR9PpvHHVr7uObGbf0nQD3CzKzT5QKCEwJojH8=",
|
||||
"hash": "sha256-T8Ob7wv/GgAR+5/AoD0SJ0k+xRvpK5lTWKrhJkme2wg=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.16.0",
|
||||
"rev": "v1.19.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ZBvIfLUMgGXJM5VgsOrerfN3TiMou3VFUrMqzMAwWaA="
|
||||
"vendorHash": "sha256-8jUEFJz2m8orL4n/w+c+hzwiQJkZia9TpVfYhkgyrrY="
|
||||
},
|
||||
"avi": {
|
||||
"hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=",
|
||||
@@ -135,11 +135,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-r2ttKyaV/cjIXYECwYmKuTe2Z1HYgiJFfMzd58Se99g=",
|
||||
"hash": "sha256-jc8mv1W9586jPaxUmmUUBk824kvQbuG7vcEbZ1k64yw=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v4.27.0",
|
||||
"rev": "v4.28.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -23,13 +23,13 @@ in
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-adaptive";
|
||||
namespace = "inputstream.adaptive";
|
||||
version = "21.5.9";
|
||||
version = "21.5.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.adaptive";
|
||||
tag = "${version}-${rel}";
|
||||
hash = "sha256-OArvp/MgJGsRs3Z59JfgOkfwyhQ3ArC1yf37z7Y7khg=";
|
||||
hash = "sha256-XcRg0FtoN7SXRVEBWM9gIlLOMGT3x64s9WD12UJdblw=";
|
||||
};
|
||||
|
||||
extraCMakeFlags = [
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
vdr,
|
||||
fetchFromGitHub,
|
||||
graphicsmagick,
|
||||
boost,
|
||||
boost186,
|
||||
libgcrypt,
|
||||
ncurses,
|
||||
callPackage,
|
||||
@@ -155,7 +155,7 @@ in
|
||||
|
||||
buildInputs = [
|
||||
vdr
|
||||
boost
|
||||
boost186
|
||||
libgcrypt
|
||||
];
|
||||
|
||||
|
||||
@@ -68,19 +68,19 @@ let
|
||||
name = "arrow-testing";
|
||||
owner = "apache";
|
||||
repo = "arrow-testing";
|
||||
rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c";
|
||||
hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o=";
|
||||
rev = "d2a13712303498963395318a4eb42872e66aead7";
|
||||
hash = "sha256-c8FL37kG0uo7o0Zp71WjCl7FD5BnVgqUCCXXX9gI0lg=";
|
||||
};
|
||||
|
||||
parquet-testing = fetchFromGitHub {
|
||||
name = "parquet-testing";
|
||||
owner = "apache";
|
||||
repo = "parquet-testing";
|
||||
rev = "c7cf1374cf284c0c73024cd1437becea75558bf8";
|
||||
hash = "sha256-DThjyZ34LajHwXZy1IhYKUGUG/ejQ9WvBNuI8eUKmSs=";
|
||||
rev = "18d17540097fca7c40be3d42c167e6bfad90763c";
|
||||
hash = "sha256-gKEQc2RKpVp39RmuZbIeIXAwiAXDHGnLXF6VQuJtnRA=";
|
||||
};
|
||||
|
||||
version = "19.0.1";
|
||||
version = "20.0.0";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "arrow-cpp";
|
||||
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "apache";
|
||||
repo = "arrow";
|
||||
rev = "apache-arrow-${version}";
|
||||
hash = "sha256-toHwUIOZRpgR0K7pQtT5nqWpO9G7AuHYTcvA6UVg9lA=";
|
||||
hash = "sha256-JFPdKraCU+xRkBTAHyY4QGnBVlOjQ1P5+gq9uxyqJtk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/cpp";
|
||||
|
||||
@@ -1,17 +1,21 @@
|
||||
--- a/CMakeLists.txt 2024-03-01 08:08:05
|
||||
+++ b/CMakeLists.txt 2024-04-24 15:45:30
|
||||
@@ -2134,7 +2134,7 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0611614fe18..a6dcb2f04b6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2567,7 +2567,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
|
||||
)
|
||||
if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
|
||||
if(APPLE)
|
||||
- if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0)
|
||||
+ if(FALSE)
|
||||
# Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag)
|
||||
# with Xcode-11 (the Clang of which doesn't support the flag).
|
||||
# Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag)
|
||||
# with Xcode-11 (the Clang of which doesn't support the flag).
|
||||
message(
|
||||
--- a/build_files/cmake/platform/platform_apple.cmake 2024-02-22 15:31:36
|
||||
+++ b/build_files/cmake/platform/platform_apple.cmake 2024-04-24 16:06:13
|
||||
@@ -55,7 +55,6 @@
|
||||
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
|
||||
index b2db64bbd2e..aac4b552655 100644
|
||||
--- a/build_files/cmake/platform/platform_apple.cmake
|
||||
+++ b/build_files/cmake/platform/platform_apple.cmake
|
||||
@@ -55,7 +55,6 @@ if(NOT DEFINED LIBDIR)
|
||||
endif()
|
||||
endif()
|
||||
if(NOT EXISTS "${LIBDIR}/.git")
|
||||
@@ -19,7 +23,7 @@
|
||||
endif()
|
||||
if(FIRST_RUN)
|
||||
message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
|
||||
@@ -115,10 +114,6 @@
|
||||
@@ -121,10 +120,6 @@ if(WITH_CODEC_SNDFILE)
|
||||
find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
|
||||
find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
|
||||
list(APPEND LIBSNDFILE_LIBRARIES
|
||||
@@ -30,35 +34,35 @@
|
||||
)
|
||||
|
||||
print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
|
||||
@@ -162,9 +157,7 @@
|
||||
@@ -168,9 +163,7 @@ if(WITH_CODEC_FFMPEG)
|
||||
set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
|
||||
set(FFMPEG_FIND_COMPONENTS
|
||||
avcodec avdevice avformat avutil
|
||||
- mp3lame ogg opus swresample swscale
|
||||
- theora theoradec theoraenc vorbis vorbisenc
|
||||
- vorbisfile vpx x264)
|
||||
+ swresample swscale)
|
||||
+ swresample swscale)
|
||||
if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
|
||||
list(APPEND FFMPEG_FIND_COMPONENTS aom)
|
||||
endif()
|
||||
@@ -275,7 +268,6 @@
|
||||
@@ -285,7 +278,6 @@ endif()
|
||||
add_bundled_libraries(boost/lib)
|
||||
|
||||
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
|
||||
- string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it !
|
||||
if(WITH_CODEC_FFMPEG)
|
||||
- string(APPEND PLATFORM_LINKFLAGS " -liconv") # ffmpeg needs it !
|
||||
endif()
|
||||
|
||||
if(WITH_PUGIXML)
|
||||
@@ -350,7 +342,7 @@
|
||||
|
||||
@@ -361,7 +353,7 @@ endif()
|
||||
# CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
|
||||
if(WITH_OPENMP)
|
||||
- if(CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||
+ if(FALSE)
|
||||
# Use OpenMP from our precompiled libraries.
|
||||
message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
|
||||
set(OPENMP_CUSTOM ON)
|
||||
@@ -427,7 +419,7 @@
|
||||
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||
- if(${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 17.0)
|
||||
+ if(FALSE) # clang in nix was compatible with openmp
|
||||
if(WITH_STRICT_BUILD_OPTIONS)
|
||||
message(SEND_ERROR "OpenMP library is not compatible with the current Clang version")
|
||||
else()
|
||||
@@ -446,7 +438,7 @@ string(APPEND PLATFORM_LINKFLAGS
|
||||
" -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'"
|
||||
)
|
||||
|
||||
@@ -67,3 +71,23 @@
|
||||
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
|
||||
# Silence "no platform load command found in <static library>, assuming: macOS".
|
||||
string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic")
|
||||
diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt
|
||||
index 935b3f94ee1..f3d73637f71 100644
|
||||
--- a/source/blender/blendthumb/CMakeLists.txt
|
||||
+++ b/source/blender/blendthumb/CMakeLists.txt
|
||||
@@ -65,15 +65,6 @@ elseif(APPLE)
|
||||
# Prevent Xcode from overwriting the signature.
|
||||
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ""
|
||||
)
|
||||
- # CMake needs the target defined in the same file as add_custom_command.
|
||||
- # It needs to be code-signed (ad-hoc in this case)
|
||||
- # even on developer machine to generate thumbnails.
|
||||
- # Command taken from XCode build process.
|
||||
- add_custom_command(
|
||||
- TARGET blender-thumbnailer POST_BUILD
|
||||
- COMMAND codesign --deep --force --sign - --entitlements "${CMAKE_SOURCE_DIR}/release/darwin/thumbnailer_entitlements.plist"
|
||||
- --timestamp=none $<TARGET_BUNDLE_DIR:blender-thumbnailer>
|
||||
- )
|
||||
elseif(UNIX)
|
||||
# -----------------------------------------------------------------------------
|
||||
# Build `blender-thumbnailer` executable
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
SDL,
|
||||
addDriverRunpath,
|
||||
alembic,
|
||||
apple-sdk_15,
|
||||
blender,
|
||||
boost,
|
||||
brotli,
|
||||
@@ -59,7 +60,7 @@
|
||||
openjpeg,
|
||||
openpgl,
|
||||
opensubdiv,
|
||||
openvdb_11,
|
||||
openvdb,
|
||||
openxr-loader,
|
||||
pkg-config,
|
||||
potrace,
|
||||
@@ -252,7 +253,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
openjpeg
|
||||
openpgl
|
||||
(opensubdiv.override { inherit cudaSupport; })
|
||||
openvdb_11
|
||||
openvdb
|
||||
potrace
|
||||
pugixml
|
||||
python3
|
||||
@@ -279,6 +280,9 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
else
|
||||
[
|
||||
SDL
|
||||
# blender chooses Metal features based on runtime system version
|
||||
# lets use the latest SDK and let Blender handle falling back on older systems.
|
||||
apple-sdk_15
|
||||
brotli
|
||||
llvmPackages.openmp
|
||||
sse2neon
|
||||
@@ -430,7 +434,6 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
broken = stdenv.hostPlatform.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile
|
||||
maintainers = with lib.maintainers; [
|
||||
amarshall
|
||||
veprbl
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.308";
|
||||
version = "0.6.309";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gqx/aOTpoN7nfstlFl4EulQ9Kzm/YlYOOiyrWIoJvcU=";
|
||||
sha256 = "sha256-T94hJqNnCsJO1Gd+CXjKXri++NZqlFjke27Xnkfz+0U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DMkBRya1Dxn8mcpuG/vtIt+v/9iVmb58iNe3fPY/xv4=";
|
||||
vendorHash = "sha256-7MXZVdpsPHfHk8hNZM2CT0FW8gTKt3oUap7CTVYMNfI=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0QzbRswTPfO2U6lrClpAsH2QbTfE7JcMjv1Qt033UZs=";
|
||||
hash = "sha256-qLErgFS/Vos99Yx7gUeLa0ysO6Anzm+kDIgKQQbQL3w=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.12.3";
|
||||
version = "1.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c/8cqHl+Z7+0SDSb6PhrVueKyWZFA1FGQaFwT3G9vFM=";
|
||||
hash = "sha256-rojiGrWUG0zk506HzwHLB1L5oJCHNUscdl6ogzFE5gk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-JXsLvo/G2GCdQuseu6TdXKdKbJ0B4yPYRNlZdjG65AU=";
|
||||
cargoHash = "sha256-+G9L5eMLQsgO5GIRU1BQkr5OwEOYPXCtSAah8l9wwr8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
shopt -s globstar
|
||||
for cmakelists in **/CMakeLists.*; do
|
||||
sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists
|
||||
${lib.optionalString (lib.versionOlder cudaPackages.cudaVersion "11.8") ''
|
||||
${lib.optionalString (cudaPackages.cudaOlder "11.8") ''
|
||||
sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists
|
||||
sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists
|
||||
''}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "editorconfig-checker";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "editorconfig-checker";
|
||||
repo = "editorconfig-checker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LoOuP98vRj/kzyWKKsXNPfE+9IELrKBtdSZvP7GtMew=";
|
||||
hash = "sha256-TRbUehdHzgjc87O8/kZyC9c9ouxJrs/nSN24E5BOrzU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3mcz7tstVfIb1ATuCwDdQ5IyCtjSGaDWNw2qCmY/ObE=";
|
||||
vendorHash = "sha256-g7SSy55IKxfM1cjyy1n7As278HU+GdNeq1vSSM4B8GM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "firebase-tools";
|
||||
version = "14.2.1";
|
||||
version = "14.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firebase";
|
||||
repo = "firebase-tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3eAzLtVNlgjktnuQ1ZJIyE2CsKZISPRuGjUTHZxX/6k=";
|
||||
hash = "sha256-Y3+Nw6+ZCnHOJeoMRhWafBVi0yrb41NX/4FcpqHk4eA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/mij1GjkRldQWaBv1YEwxMWoP6CG3ydLV2aI+K2R+t4=";
|
||||
npmDepsHash = "sha256-+rAwYopIP/NEb602TVuZEZUY+dQPzkuTXpWCBeLCjmg=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
||||
@@ -128,7 +128,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [
|
||||
mmlb
|
||||
hexa
|
||||
SuperSandro2000
|
||||
];
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goa";
|
||||
version = "3.20.1";
|
||||
version = "3.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goadesign";
|
||||
repo = "goa";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+MAK/qRvwMfjifeXmBjDWKmQ75LAbIUjZ6rvqw1Xv3I=";
|
||||
hash = "sha256-yHls7qGZhQIIYbPWCs0dm3W2DgKZq4fJbnNCPTqUy/s=";
|
||||
};
|
||||
vendorHash = "sha256-/5tcIvJpJPVMOL6XBAjXbiHeCwpB0YOLv5hRhd5zG7Q=";
|
||||
vendorHash = "sha256-mKFKZuAIQdDwDJ2DMtW18NgFn6Sd35TQHBY4xVKzoUs=";
|
||||
|
||||
subPackages = [ "cmd/goa" ];
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gobgpd";
|
||||
version = "3.36.0";
|
||||
version = "3.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osrg";
|
||||
repo = "gobgp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vyMC3FcfMHVsRosLkTYgCawiTIcJs0R5GgSZERRPHnE=";
|
||||
hash = "sha256-Nh4JmyZHrT7uPi9+CbmS3h6ezKoicCvEByUJVULMac4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bR6msi2IyNmYgmpLrbn/hnX4EzLOBa2UHTzwDJFasos=";
|
||||
vendorHash = "sha256-HpATJztX31mNWkpeDqOE4rTzhCk3c7E1PtZnKW8Axyo=";
|
||||
|
||||
postConfigure = ''
|
||||
export CGO_ENABLED=0
|
||||
|
||||
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
makeFlags = [
|
||||
"TARGET=iotop-c"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"BINDIR=${placeholder "out"}/bin"
|
||||
];
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ipfs-cluster";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
vendorHash = "sha256-y8eE1GYFiHbLY5zeSSQO86I4buZZJROGp7KzXbKjMqI=";
|
||||
vendorHash = "sha256-VVejr6B7eDNNQF34PS/PaQ50mBNZgzJS50aNzbLJgCg=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs-cluster";
|
||||
repo = "ipfs-cluster";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CpMnhqRlikKdPT3/tsLpKdKm6icePDsmqEnUEBwvCT0=";
|
||||
hash = "sha256-C3bBtZsDcYy6I0wmaYIDwhmGJVNcWq+rCdi5WHUzvB8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ligolo-ng";
|
||||
version = "0.8";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tnpitsecurity";
|
||||
repo = "ligolo-ng";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9+n6d9bY9VJiMsgvFNhbdkZ5S1Eo0YxyakuOocMvCdE=";
|
||||
hash = "sha256-+d5dBhB0ABYrGQHZ5ta5hxsAqQop7H/5P4pxNF4MIc0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1K9T7jbQxrnf9j/oa8UvZFatYOiDnJCrMc0DoFGo73U=";
|
||||
vendorHash = "sha256-oc85xNPMFeaPC7TMcSh3i3Msd8sCJ5QGFmi2fKjcyvk=";
|
||||
|
||||
postConfigure = ''
|
||||
export CGO_ENABLED=0
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGo124Module rec {
|
||||
pname = "matrix-alertmanager-receiver";
|
||||
version = "2025.4.16";
|
||||
version = "2025.4.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metio";
|
||||
repo = "matrix-alertmanager-receiver";
|
||||
tag = version;
|
||||
hash = "sha256-QxBe9WkUg6TTAgxC29kLyQzJSR6m0to0ayH+0vT9pgQ=";
|
||||
hash = "sha256-ubSrj8mUc0b6fwRuvaw8oapTyIbDRvlzEqpjIFEY1FQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-okaNjcA1fFChqaCooviPDW2VZTae9pUEGKNOTUxSSQ0=";
|
||||
vendorHash = "sha256-8LQ4SJ1zapBRuFDX8VxYUvA6jzukVml8Jr+B3zQKFOs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "memray";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloomberg";
|
||||
repo = "memray";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2gFnVILOqjsBY7dmtoN+1BLInPj0wW8u9jOs2ExmIZM=";
|
||||
hash = "sha256-n000m2jIJJFZFTjfECS3gFrO6xHauZW46xe1tDqI6Lg=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
{
|
||||
buildGoModule,
|
||||
buildPackages,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-voSGwr4wpei9U5L/6uAcapjNZ5CVn49mwngfsXMcxB0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kLFQtRAsxA7fdQIgpa0eV3hSpX5pAGT1DTGeGkawvVk=";
|
||||
|
||||
subPackages = [ "cmd/nelm" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/werf/nelm/internal/common.Brand=Nelm"
|
||||
"-X github.com/werf/nelm/internal/common.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
preCheck = ''
|
||||
# Test all packages.
|
||||
unset subPackages
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
|
||||
let
|
||||
emulator = stdenv.hostPlatform.emulator buildPackages;
|
||||
in
|
||||
''
|
||||
for shell in bash fish zsh; do
|
||||
installShellCompletion \
|
||||
--cmd nelm \
|
||||
--$shell <(${emulator} $out/bin/nelm completion $shell)
|
||||
done
|
||||
''
|
||||
);
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
meta = {
|
||||
description = "Kubernetes deployment tool, alternative to Helm 3";
|
||||
longDescription = ''
|
||||
Nelm is a Helm 3 alternative. It is a Kubernetes deployment tool that
|
||||
manages Helm Charts and deploys them to Kubernetes.
|
||||
'';
|
||||
homepage = "https://github.com/werf/nelm";
|
||||
changelog = "https://github.com/werf/nelm/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.azahi ];
|
||||
mainProgram = "nelm";
|
||||
};
|
||||
})
|
||||
@@ -11,13 +11,13 @@
|
||||
# https://github.com/abathur/resholve/issues/107
|
||||
resholve.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw=";
|
||||
hash = "sha256-H59MMmyQ9Tl9CLKKkXIv2NZddrrJNLv8XOOI2e4pG64=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "node-pre-gyp";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapbox";
|
||||
repo = "node-pre-gyp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i7iBy+X9zBKrrbIwVa61y9cbmHJmqeacXrZk+XGRok8=";
|
||||
hash = "sha256-9MADe6oY28MBAdQsu/ddVveZYwD4xeVNKUffhcvK+Q0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-0Xa5bByTskrQ8v2O1FUxtQzRb1ZEV0TvUhe8hh05QHI=";
|
||||
npmDepsHash = "sha256-yNu66HlkOVsYv60saTf7M4QuN9B2euYFu5WB7UAwhUw=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "noseyparker";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = "noseyparker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-n+lX49BwipIPQ2ZeQT+DFO2ILHHAU2VsOnhASOGX5RE=";
|
||||
hash = "sha256-6GxkIxLEgbIgg4nSHvmRedm8PAPBwVxLQUnQzh3NonA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-eAJlbJyGILc3veVxJNKqrTeZGQsAymAGYNCTU+Kakos=";
|
||||
cargoHash = "sha256-hVBHIm/12WU6g45QMxxuGk41B0kwThk7A84fOxArvno=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-look";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-look";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oP+qcOu03ZKQRdvPKCRVL187QP3gAg2dyvRO94N7+GE=";
|
||||
hash = "sha256-SyGyW4Hq0zT+jBrCmsuG+9Smcu4ruP6+aR3VUK205MM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KzAozP9pfqoFOgK+/xmwsI0m2QWAVW/b+hoWHlQoVX0=";
|
||||
vendorHash = "sha256-8ooWJTOC4fmuu+/Dy7JOaGSO5YlsMfKcf2lyv2ojJIw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-menu";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-menu";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pWdLSoTeRgr5FPdBWMTVdsnijuwu8fLuNkyIRZ+JEe8=";
|
||||
sha256 = "sha256-Ce8hxFVCj/No2Sb6avQ9ogMPTJXDcWxa3GFfsczq1+E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iR+ytThRwmCvFEMcpSELPRwiramN5jPXAjaJtda4pOw=";
|
||||
vendorHash = "sha256-53lRO4Ct20jYJY7JRElx9MWzb+TEm8KIIJZF3OfL1kQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "osc";
|
||||
version = "0.4.7";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theimpostor";
|
||||
repo = "osc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MfEBbYT99tEtlOMmdl3iq2d07KYsN1tu5tDRFW3676g=";
|
||||
hash = "sha256-XVFNcQH4MFZKmuOD9b3t320/hE+s+3igjlyHBWGKr0Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-POtQWIjPObsfa3YZ1dLZgedZFUcc4HeTWjU20AucoKc=";
|
||||
vendorHash = "sha256-k+4m9y7oAZqTr8S0zldJk5FeI3+/nN9RggKIfiyxzDI=";
|
||||
|
||||
meta = {
|
||||
description = "Command line tool to access the system clipboard from anywhere using the ANSI OSC52 sequence";
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdns";
|
||||
version = "4.9.4";
|
||||
version = "4.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-ysRm18sFZDTGBjLlVL5QVDywzs2dOzO7V4XBSbWXn8E=";
|
||||
hash = "sha256-Zpu3uZgjsyw5ATN9abOMn4Bz8vwC6HZJM7jFwJdOJyQ=";
|
||||
};
|
||||
# redact configure flags from version output to reduce closure size
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
@@ -37,16 +37,16 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
aarch64-darwin = "sha256-V9i3n/q8GrPQ9qt0AzKJPedAZeeiUm9A5IQ/8FD62b4=";
|
||||
aarch64-linux = "sha256-Qhx/zh9E+5oBjf7vMvvAVQF05rJI0aB0KcBMXZaYlDA=";
|
||||
x86_64-darwin = "sha256-eVu3RCFTHz/uVyt3aBnXBlpCtH5Jdnil0PTEREnxZvs=";
|
||||
x86_64-linux = "sha256-1tZq12F676RhbMvl4ubDirpNjU1a9yOLxd0DAK2xNqY=";
|
||||
aarch64-darwin = "sha256-zHaYgR9UXKnyikt5z3UUmh6oTNoNv5mqtnAId9kCzgE=";
|
||||
aarch64-linux = "sha256-xChYbzs4zTWe71xwn3TfUZHGTOHHjzDwbkzPgQEfQZk=";
|
||||
x86_64-darwin = "sha256-mual72UuFh9h7Hc/hHqSUeFInwm09f+UptX8jqknXlg=";
|
||||
x86_64-linux = "sha256-UCiHeg46ncRQA6rDW4uxoFRqC7cuwMdr33OrN7yj51o=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or unsupported;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.34.1.5021";
|
||||
version = "1.35.1.5034";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rav1d";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "memorysafety";
|
||||
repo = "rav1d";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Moj3v7cxPluzNPmOmGhYuz/Qh48BnBjN7Vt4f8aY2o=";
|
||||
hash = "sha256-OAfuUeScdjL7xIpf6pclNyo4ugRLIIcTjjf0AwoF+7o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-M0j0zgDqElhG3Jgetjx2sL3rxLrShK0zTMmOXwNxBEI=";
|
||||
cargoHash = "sha256-13j0++XHcNjkVc3VZxv2ukQvhiu+heZPgaTsA1U4MGQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nasm
|
||||
|
||||
@@ -12,19 +12,19 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "raycast";
|
||||
version = "1.97.0";
|
||||
version = "1.98.0";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-darwin = fetchurl {
|
||||
name = "Raycast.dmg";
|
||||
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
|
||||
hash = "sha256-cmaih5QYhdSNcYiVrfOkyOO+KMwClvrVkRykY6E9bQ4=";
|
||||
hash = "sha256-cHTGXuzi7YVAPeeMHugL7uvR9BHJ5xR7I9NE63H3vcg=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
name = "Raycast.dmg";
|
||||
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
|
||||
hash = "sha256-iJz3WIDh1n0ZgDgeHYZgxkysVjxJnbFF+48rzCLc4pw=";
|
||||
hash = "sha256-KYMjr8SA8a0B19hmdsKLLz+smBpB687e+BLRRCRM+AM=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "remnote";
|
||||
version = "1.19.22";
|
||||
version = "1.19.24";
|
||||
src = fetchurl {
|
||||
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
|
||||
hash = "sha256-ecMAHUD/qZaWquO65WcSoiAGQEXaJpTjm12z/raf0AA=";
|
||||
hash = "sha256-+ZNQ94itLdSuw7HS3cLPgJNqVcQ1OfPHF68hFwHpaDQ=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rime-ls";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wlh320";
|
||||
repo = "rime-ls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bVpFE25Maady0oyrwWf2l7FCW/VHN6mJsnEefmStxIU=";
|
||||
hash = "sha256-jDn41hSDcQQO1d4G0XV6B/JZkryHtuoHUOYpmdE1Kxo=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-j3wAGbKJCcv88C3P8iMoFlDhjXufulFXCnVpwWIAHyU=";
|
||||
cargoHash = "sha256-lmvIH6ssEqbkcDETzHL+Spd04B576o8dijigUR88l9c=";
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
ninja,
|
||||
pkg-config,
|
||||
ncurses,
|
||||
gettext,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -28,6 +29,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin gettext;
|
||||
|
||||
# The subproject "canfigger" has asan and ubsan enabled by default, disable it here
|
||||
mesonFlags = [
|
||||
"-Dcanfigger:b_sanitize=none"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "9.3.3";
|
||||
version = "9.3.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = "snakemake";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XmKwK52njnREOogI/kSIaMoZSbYmMGXiL0tPmJvVutA=";
|
||||
hash = "sha256-7yU1vhPrcuZC2d15VileZJpweDhB0rEEGVHjhm6Gmgc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sqlboiler";
|
||||
version = "4.18.0";
|
||||
version = "4.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "volatiletech";
|
||||
repo = "sqlboiler";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gpRegyW6LrKj45MDl+eOKrTqTo1wn7JOd4zPDexOB6M=";
|
||||
hash = "sha256-vsrC/i8ekjlKMVjH91XT9iizZaSD5Mi/p/4AFWBfAlQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA=";
|
||||
vendorHash = "sha256-K1Bo2aENteZYjx7jRczqdcoYZn5G8ywtCtHkVB7Reus=";
|
||||
|
||||
tags = [
|
||||
"mysql"
|
||||
|
||||
@@ -38,8 +38,7 @@ stdenv.mkDerivation rec {
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: CMakeFiles/t4k_common.dir/t4k_throttle.c.o:(.bss+0x0): multiple definition of
|
||||
# `wrapped_lines'; CMakeFiles/t4k_common.dir/t4k_audio.c.o:(.bss+0x0): first defined here
|
||||
# TODO: revisit https://github.com/tux4kids/t4kcommon/pull/10 when merged.
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon -DGNULIB_UNISTR_U8_MBTOUC_UNSAFE -Wno-incompatible-pointer-types";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tex-fmt";
|
||||
version = "0.5.2";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WGUNDERWOOD";
|
||||
repo = "tex-fmt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3kRtBfIT6QcdZ1+h2WwvxsAv/UJLtwSodF5zvCUDbHQ=";
|
||||
hash = "sha256-CAuhIJbe483Qu+wnNfXTkQ3ERAbkt07QzZ7z7pcbl10=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-4kx3co9doFYD9SjJhL17hgf6ll4niKnF57evv/eNeM0=";
|
||||
cargoHash = "sha256-ZXoaQYUYut11r6zvvIihZ3myL4B4y5yKq6P1BBtky/c=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
}:
|
||||
let
|
||||
inherit (lib) lists strings;
|
||||
inherit (cudaPackages) backendStdenv cudaVersion flags;
|
||||
inherit (cudaPackages) backendStdenv cudaAtLeast flags;
|
||||
|
||||
cuda-common-redist = with cudaPackages; [
|
||||
(lib.getDev cuda_cudart) # cuda_runtime.h
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Remove this once a release is made with
|
||||
# https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1
|
||||
postPatch = lib.optionals (strings.versionAtLeast cudaVersion "11.0") ''
|
||||
postPatch = lib.optionals (cudaAtLeast "11.0") ''
|
||||
substituteInPlace bindings/torch/setup.py --replace-fail \
|
||||
"-std=c++14" "-std=c++17"
|
||||
'';
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tippecanoe";
|
||||
version = "2.77.0";
|
||||
version = "2.78.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felt";
|
||||
repo = "tippecanoe";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7yRrUn1U0iERlix/8/oaMaizlpzqdiSIHj298ykaJjE=";
|
||||
hash = "sha256-RSth1mFiVHtiZkGVvaIRxNQ3nYtV/GAL64D7fFB1NYs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
|
||||
let
|
||||
pname = "uhk-agent";
|
||||
version = "6.0.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-UOW0TkJ+lPOMK38pjSMTrJqVWu/wRPhD7xETBeb0SUc=";
|
||||
sha256 = "sha256-C/ngBu9Fr4oqp2YB54c2VGVqsYfH9d03YEnGa/+Z2XI=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "url-parser";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "url-parser";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Kwjub9qAfHhqNL3mRzlJws1wnwVPAJ3jPYh0s/cu7+8=";
|
||||
hash = "sha256-pmsF2wYEjJ8//sUvkW0psj4ULOjwp8s3hzxVKXCM0Ok=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MR8SjQ8IrHC6hZTvmnqXvqJ6odo0+RIMDtMpYwY+iMs=";
|
||||
vendorHash = "sha256-873EOiS57LKZDehtDZyc3ACEXhUFOtIX6v+D2LUarwE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -14,12 +14,12 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "waagent";
|
||||
version = "2.12.0.4";
|
||||
version = "2.13.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "WALinuxAgent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-L8W/ijBHkNukM2G9HBRVx2wFXzgkR8gbFBljNVPs6xA=";
|
||||
hash = "sha256-W2NXxQOxRhJD/D/w58xknA9X8YYnQxwIhhjXzlCVVWA=";
|
||||
};
|
||||
patches = [
|
||||
# Suppress the following error when waagent tries to configure sshd:
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmi";
|
||||
version = "0.44.0";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "wasmi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tKUkcuVT2945+pf7qdCgbUYbtiZmfE7tfzRlf8H/GkU=";
|
||||
hash = "sha256-H/nuV4OMj2xCVej1u8zh9c9sp+XH+Zdpb080ZoA3xvc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-1p/cibicoH39+/Xrf28W2jOWK23LVu7L0nnsVDgvIV8=";
|
||||
cargoHash = "sha256-IDoZ6A5c/ayCusdb9flR3S/CBxJIWHQlEYP8ILRWXFw=";
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "widevine-cdm";
|
||||
version = "4.10.2830.0";
|
||||
version = "4.10.2891.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.google.com/widevine-cdm/${finalAttrs.version}-linux-x64.zip";
|
||||
hash = "sha256-XDnsan1ulnIK87Owedb2s9XWLzk1K2viGGQe9LN/kcE=";
|
||||
hash = "sha256-ZO6FmqJUnB9VEJ7caJt58ym8eB3/fDATri3iOWCULRI=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/mas-bandwidth/yojimbo";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.x86_64;
|
||||
maintainers = with maintainers; [ paddygord ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/romkatv/powerlevel10k";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
# Packages which have been deprecated or removed from cudaPackages
|
||||
final: prev:
|
||||
final: _:
|
||||
let
|
||||
inherit (prev.lib) warn;
|
||||
inherit (builtins) mapAttrs;
|
||||
|
||||
mkRenamed =
|
||||
oldName:
|
||||
{ path, package }:
|
||||
warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
|
||||
final.lib.warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
|
||||
in
|
||||
mapAttrs mkRenamed {
|
||||
builtins.mapAttrs mkRenamed {
|
||||
# A comment to prevent empty { } from collapsing into a single line
|
||||
|
||||
cudaVersion = {
|
||||
path = "cudaPackages.cudaMajorMinorVersion";
|
||||
package = final.cudaMajorMinorVersion;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
@@ -27,7 +27,7 @@ let
|
||||
|
||||
# Samples are built around the CUDA Toolkit, which is not available for
|
||||
# aarch64. Check for both CUDA version and platform.
|
||||
cudaVersionIsSupported = cudaVersionToHash ? ${cudaVersion};
|
||||
cudaVersionIsSupported = cudaVersionToHash ? ${cudaMajorMinorVersion};
|
||||
platformIsSupported = hostPlatform.isx86_64;
|
||||
isSupported = cudaVersionIsSupported && platformIsSupported;
|
||||
|
||||
@@ -36,8 +36,7 @@ let
|
||||
final: _:
|
||||
lib.attrsets.optionalAttrs isSupported {
|
||||
cuda-samples = final.callPackage ./generic.nix {
|
||||
inherit cudaVersion;
|
||||
hash = cudaVersionToHash.${cudaVersion};
|
||||
hash = cudaVersionToHash.${cudaMajorMinorVersion};
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
backendStdenv,
|
||||
cmake,
|
||||
cudatoolkit,
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
freeimage,
|
||||
@@ -20,7 +20,7 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
|
||||
pname = "cuda-samples";
|
||||
version = cudaVersion;
|
||||
version = cudaMajorMinorVersion;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ cudaVersion, lib }:
|
||||
{ cudaMajorMinorVersion, lib }:
|
||||
let
|
||||
inherit (lib) attrsets modules trivial;
|
||||
redistName = "cuda";
|
||||
@@ -23,10 +23,10 @@ let
|
||||
};
|
||||
|
||||
# Check if the current CUDA version is supported.
|
||||
cudaVersionMappingExists = builtins.hasAttr cudaVersion cudaVersionMap;
|
||||
cudaVersionMappingExists = builtins.hasAttr cudaMajorMinorVersion cudaVersionMap;
|
||||
|
||||
# fullCudaVersion : String
|
||||
fullCudaVersion = cudaVersionMap.${cudaVersion};
|
||||
fullCudaVersion = cudaVersionMap.${cudaMajorMinorVersion};
|
||||
|
||||
evaluatedModules = modules.evalModules {
|
||||
modules = [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
runPatches ? [ ],
|
||||
autoPatchelfHook,
|
||||
autoAddDriverRunpath,
|
||||
@@ -54,7 +54,7 @@
|
||||
let
|
||||
# Version info for the classic cudatoolkit packages that contain everything that is in redist.
|
||||
releases = builtins.import ./releases.nix;
|
||||
release = releases.${cudaVersion};
|
||||
release = releases.${cudaMajorMinorVersion};
|
||||
in
|
||||
|
||||
backendStdenv.mkDerivation rec {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
backendStdenv,
|
||||
cudaOlder,
|
||||
cudatoolkit-legacy-runfile,
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
cuda_cccl ? null,
|
||||
cuda_cudart ? null,
|
||||
cuda_cuobjdump ? null,
|
||||
@@ -66,8 +66,8 @@ if cudaOlder "11.4" then
|
||||
cudatoolkit-legacy-runfile
|
||||
else
|
||||
symlinkJoin rec {
|
||||
name = "cuda-merged-${cudaVersion}";
|
||||
version = cudaVersion;
|
||||
name = "cuda-merged-${cudaMajorMinorVersion}";
|
||||
version = cudaMajorMinorVersion;
|
||||
|
||||
paths = builtins.concatMap getAllOutputs allPackages;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
flags,
|
||||
mkVersionedPackageName,
|
||||
}:
|
||||
@@ -54,15 +54,6 @@ let
|
||||
releaseGrabber
|
||||
]) cusparseltVersions;
|
||||
|
||||
# Our cudaVersion tells us which version of CUDA we're building against.
|
||||
# The subdirectories in lib/ tell us which versions of CUDA are supported.
|
||||
# Typically the names will look like this:
|
||||
#
|
||||
# - 10.2
|
||||
# - 11
|
||||
# - 11.0
|
||||
# - 12
|
||||
|
||||
# A release is supported if it has a libPath that matches our CUDA version for our platform.
|
||||
# LibPath are not constant across the same release -- one platform may support fewer
|
||||
# CUDA versions than another.
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
# - Instead of providing different releases for each version of CUDA, CuTensor has multiple subdirectories in `lib`
|
||||
# -- one for each version of CUDA.
|
||||
{
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
flags,
|
||||
lib,
|
||||
mkVersionedPackageName,
|
||||
@@ -73,7 +73,7 @@ let
|
||||
releaseGrabber
|
||||
]) cutensorVersions;
|
||||
|
||||
# Our cudaVersion tells us which version of CUDA we're building against.
|
||||
# Our cudaMajorMinorVersion tells us which version of CUDA we're building against.
|
||||
# The subdirectories in lib/ tell us which versions of CUDA are supported.
|
||||
# Typically the names will look like this:
|
||||
#
|
||||
@@ -85,10 +85,9 @@ let
|
||||
# libPath :: String
|
||||
libPath =
|
||||
let
|
||||
cudaMajorMinor = versions.majorMinor cudaVersion;
|
||||
cudaMajor = versions.major cudaVersion;
|
||||
cudaMajorVersion = versions.major cudaMajorMinorVersion;
|
||||
in
|
||||
if cudaMajorMinor == "10.2" then cudaMajorMinor else cudaMajor;
|
||||
if cudaMajorMinorVersion == "10.2" then cudaMajorMinorVersion else cudaMajorVersion;
|
||||
|
||||
# A release is supported if it has a libPath that matches our CUDA version for our platform.
|
||||
# LibPath are not constant across the same release -- one platform may support fewer
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
cudaOlder,
|
||||
cudatoolkit,
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
fetchurl,
|
||||
lib,
|
||||
libcublas ? null, # cuDNN uses CUDA Toolkit on old releases, where libcublas is not available.
|
||||
@@ -25,7 +25,7 @@ finalAttrs: prevAttrs: {
|
||||
cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion;
|
||||
cudaTooNew =
|
||||
(finalAttrs.passthru.featureRelease.maxCudaVersion != null)
|
||||
&& strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaVersion;
|
||||
&& strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion;
|
||||
in
|
||||
prevAttrs.badPlatformsConditions or { }
|
||||
// {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
cudaOlder,
|
||||
cudaPackages,
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
lib,
|
||||
mkVersionedPackageName,
|
||||
patchelf,
|
||||
@@ -30,7 +30,7 @@ finalAttrs: prevAttrs: {
|
||||
cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion;
|
||||
cudaTooNew =
|
||||
(finalAttrs.passthru.featureRelease.maxCudaVersion != null)
|
||||
&& strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaVersion;
|
||||
&& strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion;
|
||||
cudnnVersionIsSpecified = finalAttrs.passthru.featureRelease.cudnnVersion != null;
|
||||
cudnnVersionSpecified = versions.majorMinor finalAttrs.passthru.featureRelease.cudnnVersion;
|
||||
cudnnVersionProvided = versions.majorMinor finalAttrs.passthru.cudnn.version;
|
||||
@@ -52,7 +52,7 @@ finalAttrs: prevAttrs: {
|
||||
inherit (finalAttrs.passthru.redistribRelease) hash;
|
||||
message = ''
|
||||
To use the TensorRT derivation, you must join the NVIDIA Developer Program and
|
||||
download the ${finalAttrs.version} TAR package for CUDA ${cudaVersion} from
|
||||
download the ${finalAttrs.version} TAR package for CUDA ${cudaMajorMinorVersion} from
|
||||
${finalAttrs.meta.homepage}.
|
||||
|
||||
Once you have downloaded the file, add it to the store with the following
|
||||
@@ -96,7 +96,7 @@ finalAttrs: prevAttrs: {
|
||||
'';
|
||||
|
||||
passthru = prevAttrs.passthru or { } // {
|
||||
useCudatoolkitRunfile = strings.versionOlder cudaVersion "11.3.999";
|
||||
useCudatoolkitRunfile = strings.versionOlder cudaMajorMinorVersion "11.3.999";
|
||||
# The CUDNN used with TensorRT.
|
||||
# If null, the default cudnn derivation will be used.
|
||||
# If a version is specified, the cudnn derivation with that version will be used,
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
cudaCapabilities ? (config.cudaCapabilities or [ ]),
|
||||
cudaForwardCompat ? (config.cudaForwardCompat or true),
|
||||
lib,
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
stdenv,
|
||||
# gpus :: List Gpu
|
||||
gpus,
|
||||
@@ -44,9 +44,9 @@ let
|
||||
gpu:
|
||||
let
|
||||
inherit (gpu) minCudaVersion maxCudaVersion;
|
||||
lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion;
|
||||
lowerBoundSatisfied = strings.versionAtLeast cudaMajorMinorVersion minCudaVersion;
|
||||
upperBoundSatisfied =
|
||||
(maxCudaVersion == null) || !(strings.versionOlder maxCudaVersion cudaVersion);
|
||||
(maxCudaVersion == null) || !(strings.versionOlder maxCudaVersion cudaMajorMinorVersion);
|
||||
in
|
||||
lowerBoundSatisfied && upperBoundSatisfied;
|
||||
|
||||
@@ -57,7 +57,7 @@ let
|
||||
let
|
||||
inherit (gpu) dontDefaultAfter isJetson;
|
||||
newGpu = dontDefaultAfter == null;
|
||||
recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaVersion;
|
||||
recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaMajorMinorVersion;
|
||||
in
|
||||
recentGpu && !isJetson;
|
||||
|
||||
@@ -289,12 +289,14 @@ assert
|
||||
};
|
||||
actualWrapped = (builtins.tryEval (builtins.deepSeq actual actual)).value;
|
||||
in
|
||||
asserts.assertMsg ((strings.versionAtLeast cudaVersion "11.2") -> (expected == actualWrapped)) ''
|
||||
This test should only fail when using a version of CUDA older than 11.2, the first to support
|
||||
8.6.
|
||||
Expected: ${builtins.toJSON expected}
|
||||
Actual: ${builtins.toJSON actualWrapped}
|
||||
'';
|
||||
asserts.assertMsg
|
||||
((strings.versionAtLeast cudaMajorMinorVersion "11.2") -> (expected == actualWrapped))
|
||||
''
|
||||
This test should only fail when using a version of CUDA older than 11.2, the first to support
|
||||
8.6.
|
||||
Expected: ${builtins.toJSON expected}
|
||||
Actual: ${builtins.toJSON actualWrapped}
|
||||
'';
|
||||
# Check mixed Jetson and non-Jetson devices
|
||||
assert
|
||||
let
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
# callPackage-provided arguments
|
||||
lib,
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
flags,
|
||||
stdenv,
|
||||
# Expected to be passed by the caller
|
||||
@@ -30,16 +30,7 @@
|
||||
shimsFn ? (throw "shimsFn must be provided"),
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
attrsets
|
||||
lists
|
||||
modules
|
||||
strings
|
||||
;
|
||||
|
||||
inherit (stdenv) hostPlatform;
|
||||
|
||||
evaluatedModules = modules.evalModules {
|
||||
evaluatedModules = lib.modules.evalModules {
|
||||
modules = [
|
||||
../modules
|
||||
releasesModule
|
||||
@@ -50,49 +41,55 @@ let
|
||||
# - Releases: ../modules/${pname}/releases/releases.nix
|
||||
# - Package: ../modules/${pname}/releases/package.nix
|
||||
|
||||
# FIXME: do this at the module system level
|
||||
propagatePlatforms = lib.mapAttrs (
|
||||
redistArch: packages: map (p: { inherit redistArch; } // p) packages
|
||||
);
|
||||
# redistArch :: String
|
||||
# Value is `"unsupported"` if the platform is not supported.
|
||||
redistArch = flags.getRedistArch stdenv.hostPlatform.system;
|
||||
|
||||
# All releases across all platforms
|
||||
# Check whether a package supports our CUDA version.
|
||||
# satisfiesCudaVersion :: Package -> Bool
|
||||
satisfiesCudaVersion =
|
||||
package:
|
||||
lib.versionAtLeast cudaMajorMinorVersion package.minCudaVersion
|
||||
&& lib.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion;
|
||||
|
||||
# Releases for our platform and CUDA version.
|
||||
# See ../modules/${pname}/releases/releases.nix
|
||||
releaseSets = propagatePlatforms evaluatedModules.config.${pname}.releases;
|
||||
# allPackages :: List Package
|
||||
allPackages = lib.filter satisfiesCudaVersion (
|
||||
evaluatedModules.config.${pname}.releases.${redistArch} or [ ]
|
||||
);
|
||||
|
||||
# Compute versioned attribute name to be used in this package set
|
||||
# Patch version changes should not break the build, so we only use major and minor
|
||||
# computeName :: Package -> String
|
||||
computeName = { version, ... }: mkVersionedPackageName pname version;
|
||||
computeName = package: mkVersionedPackageName pname package.version;
|
||||
|
||||
# Check whether a package supports our CUDA version and platform.
|
||||
# isSupported :: Package -> Bool
|
||||
isSupported =
|
||||
package:
|
||||
redistArch == package.redistArch
|
||||
&& strings.versionAtLeast cudaVersion package.minCudaVersion
|
||||
&& strings.versionAtLeast package.maxCudaVersion cudaVersion;
|
||||
|
||||
# Get all of the packages for our given platform.
|
||||
# redistArch :: String
|
||||
# Value is `"unsupported"` if the platform is not supported.
|
||||
redistArch = flags.getRedistArch hostPlatform.system;
|
||||
|
||||
preferable =
|
||||
p1: p2: (isSupported p2 -> isSupported p1) && (strings.versionOlder p2.version p1.version);
|
||||
|
||||
# All the supported packages we can build for our platform.
|
||||
# perSystemReleases :: List Package
|
||||
allReleases = lib.pipe releaseSets [
|
||||
(lib.attrValues)
|
||||
(lists.flatten)
|
||||
(lib.groupBy (p: lib.versions.majorMinor p.version))
|
||||
(lib.mapAttrs (_: builtins.sort preferable))
|
||||
(lib.mapAttrs (_: lib.take 1))
|
||||
(lib.attrValues)
|
||||
(lib.concatMap lib.trivial.id)
|
||||
];
|
||||
|
||||
newest = builtins.head (builtins.sort preferable allReleases);
|
||||
# The newest package for each major-minor version, with newest first.
|
||||
# newestPackages :: List Package
|
||||
newestPackages =
|
||||
let
|
||||
newestForEachMajorMinorVersion = lib.foldl' (
|
||||
newestPackages: package:
|
||||
let
|
||||
majorMinorVersion = lib.versions.majorMinor package.version;
|
||||
existingPackage = newestPackages.${majorMinorVersion} or null;
|
||||
in
|
||||
newestPackages
|
||||
// {
|
||||
${majorMinorVersion} =
|
||||
# Only keep the existing package if it is newer than the one we are considering.
|
||||
if existingPackage != null && lib.versionOlder package.version existingPackage.version then
|
||||
existingPackage
|
||||
else
|
||||
package;
|
||||
}
|
||||
) { } allPackages;
|
||||
in
|
||||
# Sort the packages by version so the newest is first.
|
||||
# NOTE: builtins.sort requires a strict weak ordering, so we must use versionOlder rather than versionAtLeast.
|
||||
lib.sort (p1: p2: lib.versionOlder p2.version p1.version) (
|
||||
lib.attrValues newestForEachMajorMinorVersion
|
||||
);
|
||||
|
||||
extension =
|
||||
final: _:
|
||||
@@ -102,25 +99,24 @@ let
|
||||
buildPackage =
|
||||
package:
|
||||
let
|
||||
shims = final.callPackage shimsFn {
|
||||
inherit package;
|
||||
inherit (package) redistArch;
|
||||
};
|
||||
shims = final.callPackage shimsFn { inherit package redistArch; };
|
||||
name = computeName package;
|
||||
drv = final.callPackage ./manifest.nix {
|
||||
inherit pname redistName;
|
||||
inherit (shims) redistribRelease featureRelease;
|
||||
};
|
||||
in
|
||||
attrsets.nameValuePair name drv;
|
||||
lib.nameValuePair name drv;
|
||||
|
||||
# versionedDerivations :: AttrSet Derivation
|
||||
versionedDerivations = builtins.listToAttrs (lists.map buildPackage allReleases);
|
||||
versionedDerivations = builtins.listToAttrs (lib.map buildPackage newestPackages);
|
||||
|
||||
defaultDerivation = {
|
||||
${pname} = (buildPackage newest).value;
|
||||
${pname} = (buildPackage (lib.head newestPackages)).value;
|
||||
};
|
||||
in
|
||||
versionedDerivations // defaultDerivation;
|
||||
# NOTE: Must condition on the length of newestPackages to avoid non-total function lib.head aborting if
|
||||
# newestPackages is empty.
|
||||
lib.optionalAttrs (lib.length newestPackages > 0) (versionedDerivations // defaultDerivation);
|
||||
in
|
||||
extension
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++
|
||||
# Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
|
||||
{
|
||||
cudaVersion,
|
||||
cudaMajorMinorVersion,
|
||||
lib,
|
||||
nvccCompatibilities,
|
||||
pkgs,
|
||||
@@ -16,7 +16,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
gccMajorVersion = nvccCompatibilities.${cudaVersion}.gccMaxMajorVersion;
|
||||
gccMajorVersion = nvccCompatibilities.${cudaMajorMinorVersion}.gccMaxMajorVersion;
|
||||
cudaStdenv = stdenvAdapters.useLibsFrom stdenv pkgs."gcc${gccMajorVersion}Stdenv";
|
||||
passthruExtra = {
|
||||
# cudaPackages.backendStdenv.nixpkgsCompatibleLibstdcxx has been removed,
|
||||
|
||||
@@ -17,8 +17,9 @@ let
|
||||
cuda_cccl
|
||||
cuda_cudart
|
||||
cuda_nvcc
|
||||
cudaAtLeast
|
||||
cudaOlder
|
||||
cudatoolkit
|
||||
cudaVersion
|
||||
nccl
|
||||
;
|
||||
in
|
||||
@@ -43,25 +44,25 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs =
|
||||
[ which ]
|
||||
++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ cudatoolkit ]
|
||||
++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ cuda_nvcc ];
|
||||
++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
|
||||
++ lib.optionals (cudaAtLeast "11.4") [ cuda_nvcc ];
|
||||
|
||||
buildInputs =
|
||||
[ nccl ]
|
||||
++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ cudatoolkit ]
|
||||
++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [
|
||||
++ lib.optionals (cudaOlder "11.4") [ cudatoolkit ]
|
||||
++ lib.optionals (cudaAtLeast "11.4") [
|
||||
cuda_nvcc # crt/host_config.h
|
||||
cuda_cudart
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [
|
||||
++ lib.optionals (cudaAtLeast "12.0") [
|
||||
cuda_cccl # <nv/target>
|
||||
]
|
||||
++ lib.optionals mpiSupport [ mpi ];
|
||||
|
||||
makeFlags =
|
||||
[ "NCCL_HOME=${nccl}" ]
|
||||
++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ "CUDA_HOME=${cudatoolkit}" ]
|
||||
++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ "CUDA_HOME=${cuda_nvcc}" ]
|
||||
++ lib.optionals (cudaOlder "11.4") [ "CUDA_HOME=${cudatoolkit}" ]
|
||||
++ lib.optionals (cudaAtLeast "11.4") [ "CUDA_HOME=${cuda_nvcc}" ]
|
||||
++ lib.optionals mpiSupport [ "MPI=1" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
|
||||
hexa
|
||||
misuzu
|
||||
];
|
||||
broken = (lib.versionOlder cudaPackages.cudaVersion "11.4") || !(withCuDNN -> withCUDA);
|
||||
broken = (cudaPackages.cudaOlder "11.4") || !(withCuDNN -> withCUDA);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
openvdb,
|
||||
}:
|
||||
|
||||
openvdb.overrideAttrs (old: rec {
|
||||
name = "${old.pname}-${version}";
|
||||
version = "11.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "openvdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ=";
|
||||
};
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.mpl20;
|
||||
};
|
||||
})
|
||||
@@ -63,8 +63,6 @@ stdenv.mkDerivation {
|
||||
|
||||
inherit (param) patches;
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
postPatch =
|
||||
param.postPatchInit
|
||||
+ ''
|
||||
@@ -78,6 +76,10 @@ stdenv.mkDerivation {
|
||||
"allopt"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/lib/ocaml/${ocaml.version}/site-lib/{,caml}zip
|
||||
'';
|
||||
|
||||
@@ -3,35 +3,37 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
python,
|
||||
typing-extensions,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awacs";
|
||||
version = "2.5.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mdU88KH1bxsJROG70tS2FYvRSrlHlBK9GKxR4gg1OFw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [ typing-extensions ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover
|
||||
'';
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "awacs" ];
|
||||
|
||||
meta = with lib; {
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "AWS Access Policy Language creation library";
|
||||
homepage = "https://github.com/cloudtools/awacs";
|
||||
changelog = "https://github.com/cloudtools/awacs/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ jlesquembre ];
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ jlesquembre ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,9 +14,9 @@ let
|
||||
version = "0.45.1";
|
||||
|
||||
inherit (torch) cudaPackages cudaSupport;
|
||||
inherit (cudaPackages) cudaVersion;
|
||||
inherit (cudaPackages) cudaMajorMinorVersion;
|
||||
|
||||
cudaVersionString = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor cudaVersion);
|
||||
cudaMajorMinorVersionString = lib.replaceStrings [ "." ] [ "" ] cudaMajorMinorVersion;
|
||||
|
||||
# NOTE: torchvision doesn't use cudnn; torch does!
|
||||
# For this reason it is not included.
|
||||
@@ -32,7 +32,7 @@ let
|
||||
];
|
||||
|
||||
cuda-native-redist = symlinkJoin {
|
||||
name = "cuda-native-redist-${cudaVersion}";
|
||||
name = "cuda-native-redist-${cudaMajorMinorVersion}";
|
||||
paths =
|
||||
with cudaPackages;
|
||||
[
|
||||
@@ -45,7 +45,7 @@ let
|
||||
};
|
||||
|
||||
cuda-redist = symlinkJoin {
|
||||
name = "cuda-redist-${cudaVersion}";
|
||||
name = "cuda-redist-${cudaMajorMinorVersion}";
|
||||
paths = cuda-common-redist;
|
||||
};
|
||||
in
|
||||
@@ -73,7 +73,7 @@ buildPythonPackage {
|
||||
--replace-fail "if cuda_specs:" "if True:" \
|
||||
--replace-fail \
|
||||
"cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \
|
||||
"cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaVersionString}.so'"
|
||||
"cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaMajorMinorVersionString}.so'"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.38.11";
|
||||
version = "1.38.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-QnrqRjn7YptC1BjhOXLc0VahE9oEKQkgeHLrgBqPCcM=";
|
||||
hash = "sha256-QJSYymyeTOnzLhFTUhe5f6xc1BPlYDOfQAHAJuu3mVI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.38.11";
|
||||
version = "1.38.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-WJjdhVrhUnJdYP9I4fQA/CPRj7D/C5vUpFRYryxEbr4=";
|
||||
hash = "sha256-2GVra+ICCPu/1C/e6BuMU3TIrjF6AEbfbBVRQKYGpX4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -45,7 +45,7 @@ let
|
||||
# cusparselt
|
||||
];
|
||||
cudatoolkit-joined = symlinkJoin {
|
||||
name = "cudatoolkit-joined-${cudaPackages.cudaVersion}";
|
||||
name = "cudatoolkit-joined-${cudaPackages.cudaMajorMinorVersion}";
|
||||
paths =
|
||||
outpaths
|
||||
++ lib.concatMap (f: lib.map f outpaths) [
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "evdev";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3GQKBkyxyf4fi5cNwgOZRaKidde37mIoS/QnI4q+Re4=";
|
||||
hash = "sha256-XTJ4iSzh+Sp01r+IjMhSXZ9or4Xb4zbJXRyH+49CMGk=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchFromBitbucket,
|
||||
setuptools,
|
||||
numpy,
|
||||
scipy,
|
||||
sympy,
|
||||
recursivenodes,
|
||||
symengine,
|
||||
fenics-ufl,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "firdrake-fiat";
|
||||
version = "2025.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "fiat";
|
||||
tag = version;
|
||||
hash = "sha256-i+hDpeg4SYRF7OK6uh1p1gVscyuJ4FjmyUUiLR7P7/A=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
let
|
||||
fiat-reference-data = fetchFromBitbucket {
|
||||
owner = "fenics-project";
|
||||
repo = "fiat-reference-data";
|
||||
rev = "0c8c97f7e4919402129e5ff3b54e3f0b9e902b7c";
|
||||
hash = "sha256-vdCkmCkKvLSYACF6MnZ/WuKuCNAoC3uu1A/9m9KwBK8=";
|
||||
};
|
||||
in
|
||||
''
|
||||
ln -s ${fiat-reference-data} test/FIAT/regression/fiat-reference-data
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
scipy
|
||||
sympy
|
||||
recursivenodes
|
||||
fenics-ufl
|
||||
symengine
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"FIAT"
|
||||
"finat"
|
||||
"finat.ufl"
|
||||
"gem"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--skip-download"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "FInite element Automatic Tabulator";
|
||||
homepage = "http://fenics-fiat.readthedocs.org/";
|
||||
downloadPage = "https://github.com/firedrakeproject/fiat";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ qbisi ];
|
||||
};
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "forecast-solar";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "forecast_solar";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1oPcYEwjkkK+hAemUXaG/LFleBtsjbPUZ1b2W9/BNlg=";
|
||||
hash = "sha256-ZBkuhONvn1/QpD+ml3HJinMIdg1HFpVj5KZAlUt/qR4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
}:
|
||||
let
|
||||
inherit (jaxlib) version;
|
||||
inherit (cudaPackages) cudaVersion;
|
||||
inherit (cudaPackages) cudaAtLeast;
|
||||
|
||||
cudaLibPath = lib.makeLibraryPath (
|
||||
with cudaPackages;
|
||||
@@ -101,7 +101,6 @@ buildPythonPackage rec {
|
||||
platforms = lib.platforms.linux;
|
||||
# see CUDA compatibility matrix
|
||||
# https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
|
||||
broken =
|
||||
!(lib.versionAtLeast cudaVersion "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
|
||||
broken = !(cudaAtLeast "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
}:
|
||||
let
|
||||
inherit (jaxlib) version;
|
||||
inherit (cudaPackages) cudaVersion;
|
||||
inherit (cudaPackages) cudaAtLeast;
|
||||
inherit (jax-cuda12-pjrt) cudaLibPath;
|
||||
|
||||
getSrcFromPypi =
|
||||
@@ -133,7 +133,6 @@ buildPythonPackage {
|
||||
platforms = lib.platforms.linux;
|
||||
# see CUDA compatibility matrix
|
||||
# https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
|
||||
broken =
|
||||
!(lib.versionAtLeast cudaVersion "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
|
||||
broken = !(cudaAtLeast "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
|
||||
};
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
let
|
||||
inherit (cudaPackages)
|
||||
cudaFlags
|
||||
cudaVersion
|
||||
cudaMajorMinorVersion
|
||||
nccl
|
||||
;
|
||||
|
||||
@@ -317,7 +317,7 @@ let
|
||||
build --action_env CUDA_TOOLKIT_PATH="${cuda_build_deps_joined}"
|
||||
build --action_env CUDNN_INSTALL_PATH="${cudnnMerged}"
|
||||
build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnnMerged},${lib.getDev nccl}"
|
||||
build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudaVersion}"
|
||||
build --action_env TF_CUDA_VERSION="${cudaMajorMinorVersion}"
|
||||
build --action_env TF_CUDNN_VERSION="${lib.versions.major cudaPackages.cudnn.version}"
|
||||
build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}"
|
||||
''
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "junos-eznc";
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "Juniper";
|
||||
repo = "py-junos-eznc";
|
||||
tag = version;
|
||||
hash = "sha256-mBcqDEU6ynxDTUP+PqhOy/5n4aJuxUl9g/z0Ef5PN5g=";
|
||||
hash = "sha256-iuCVfzS8k/TZ58v/OPJfSpIMYwwKRj1zyd4FF/KLjjI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -21,12 +21,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kaggle";
|
||||
version = "1.7.4.2";
|
||||
version = "1.7.4.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CxRDWPQYe96D6KAzVUm/c2+0ZmlycqE1qYXrbSxvnLY=";
|
||||
hash = "sha256-HZghvWpqFHB0HHbSZJWhhHW1p7/gyAsZGRJUsnNdQd0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-chroma";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-chroma==${version}";
|
||||
hash = "sha256-GFDaUA0E25YDHYLwrpsAuOiBWFvHByl61XhwK5NmJbg=";
|
||||
hash = "sha256-6WOViBKXZ844g2M6pYohHsXnzJiWbTNgj9EjN+z+B+4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/partners/chroma";
|
||||
@@ -59,7 +59,7 @@ buildPythonPackage rec {
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^langchain-chroma==([0-9.]+)$"
|
||||
"langchain-chroma==([0-9.]+)"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -29,18 +29,21 @@
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
syrupy,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-core";
|
||||
version = "0.3.56";
|
||||
version = "0.3.59";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-core==${version}";
|
||||
hash = "sha256-gsjYr22Phb71oKN4iVGsi6r1iETDhFHCKKOiwp0SuLU=";
|
||||
hash = "sha256-qfNt6rH2nHIFfzqZCTsIhWfXntRXvSKnzfQrNS3LWcs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/core";
|
||||
@@ -85,9 +88,11 @@ buildPythonPackage rec {
|
||||
doCheck = true;
|
||||
});
|
||||
|
||||
updateScript = {
|
||||
command = [ ./update.sh ];
|
||||
supportedFeatures = [ "commit" ];
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"langchain-core==([0-9.]+)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
pdm-backend,
|
||||
|
||||
# dependencies
|
||||
huggingface-hub,
|
||||
@@ -27,23 +26,26 @@
|
||||
responses,
|
||||
syrupy,
|
||||
toml,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-huggingface";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-huggingface==${version}";
|
||||
hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
|
||||
hash = "sha256-TqxssbqqjJV+/ynM2wo3C1aCV6wy0DsvdEuiTvVqNa8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/partners/huggingface";
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
# Each component release requests the exact latest core.
|
||||
@@ -81,7 +83,7 @@ buildPythonPackage rec {
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^langchain-huggingface==([0-9.]+)$"
|
||||
"langchain-huggingface==([0-9.]+)"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
# build-system
|
||||
pdm-backend,
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
langchain-core,
|
||||
@@ -17,26 +16,26 @@
|
||||
pytest-asyncio,
|
||||
syrupy,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-ollama";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-ollama==${version}";
|
||||
hash = "sha256-nKLz9eCGaonECmr3Uby3j4ul5jQZaqUH3PD20z/JKek=";
|
||||
hash = "sha256-GRaWwUR26yZqjtO5f5p8abj/4KSrQE2uGAECGjeDxPY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/partners/ollama";
|
||||
|
||||
build-system = [
|
||||
pdm-backend
|
||||
poetry-core
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -64,7 +63,7 @@ buildPythonPackage rec {
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"langchain-ollama==(.*)"
|
||||
"langchain-ollama==([0-9.]+)"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
|
||||
# build-system
|
||||
pdm-backend,
|
||||
@@ -25,18 +24,21 @@
|
||||
responses,
|
||||
syrupy,
|
||||
toml,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-openai";
|
||||
version = "0.3.12";
|
||||
version = "0.3.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-openai==${version}";
|
||||
hash = "sha256-pIXdXGrYOoE8sF+cKpX82QfTaYna8kbzUv0n+yR7uHE=";
|
||||
hash = "sha256-e8y5rL+OUFOAPfXTC+XHn/wVfsecPInsS8hBxm1USAw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/partners/openai";
|
||||
@@ -88,6 +90,7 @@ buildPythonPackage rec {
|
||||
"test_azure_openai_uses_actual_secret_value_from_secretstr"
|
||||
"test_azure_serialized_secrets"
|
||||
"test_chat_openai_get_num_tokens"
|
||||
"test_embed_documents_with_custom_chunk_size"
|
||||
"test_get_num_tokens_from_messages"
|
||||
"test_get_token_ids"
|
||||
"test_init_o1"
|
||||
@@ -99,7 +102,7 @@ buildPythonPackage rec {
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^langchain-openai==([0-9.]+)$"
|
||||
"langchain-openai==([0-9.]+)"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -19,18 +19,21 @@
|
||||
pytest-asyncio,
|
||||
pytest-socket,
|
||||
pytestCheckHook,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-tests";
|
||||
version = "0.3.17";
|
||||
version = "0.3.19";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-tests==${version}";
|
||||
hash = "sha256-jhdCpZsRvCxDIfaZpdqAdx+rxJTU6QHDgNKc4w7XmR8=";
|
||||
hash = "sha256-DSTngWRFseJ6kSAY7Lxxkh77QFr0jhHxG3mH89QmdxA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/standard-tests";
|
||||
@@ -61,8 +64,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit (langchain-core) updateScript;
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"langchain-tests==([0-9.]+)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-text-splitters";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-text-splitters==${version}";
|
||||
hash = "sha256-tIX1nxmXU3xhJuM2Q3Tm4fbCoJwI0A8+G1aSyLcoNo0=";
|
||||
hash = "sha256-Ia3ZZ94uLZUVr1/w4HLPZLM6u8leA4OJtAwUf7eSAE0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/text-splitters";
|
||||
|
||||
@@ -42,14 +42,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain";
|
||||
version = "0.3.24";
|
||||
version = "0.3.25";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain==${version}";
|
||||
hash = "sha256-Up/pH2TxLPiPO49oIa2ZlNeH3TyN9sZSlNsqOIRmlxc=";
|
||||
hash = "sha256-B2Kg8kC6Qlu89hZVMhgqPU32BwFvgAti0IIYUdosT1A=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/langchain";
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
mpi4py,
|
||||
pytest,
|
||||
pytestCheckHook,
|
||||
mpiCheckPhaseHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mpi-pytest";
|
||||
version = "2025.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "mpi-pytest";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-r9UB5H+qAJc6k2SVAiOCI2yRDLNv2zKRmfrAan+cX9I=";
|
||||
};
|
||||
|
||||
# A temporary fixup to support fork mode with openmpi implemention
|
||||
# See https://github.com/firedrakeproject/mpi-pytest/pull/17
|
||||
postPatch = lib.optionalString (mpi4py.mpi.pname == "openmpi") ''
|
||||
substituteInPlace pytest_mpi/plugin.py \
|
||||
--replace-fail '"-genv", CHILD_PROCESS_FLAG, "1"' '"-x", f"{CHILD_PROCESS_FLAG}=1"'
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
mpi4py
|
||||
pytest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_mpi"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mpiCheckPhaseHook
|
||||
mpi4py.mpi
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/firedrakeproject/mpi-pytest";
|
||||
description = "Pytest plugin that lets you run tests in parallel with MPI";
|
||||
changelog = "https://github.com/firedrakeproject/mpi-pytest/releases/tag/${src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ qbisi ];
|
||||
};
|
||||
}
|
||||
@@ -230,8 +230,8 @@ rec {
|
||||
"sha256-VjOZFmwH6R4GlfseWBA6JIsr7g214sPwcVV3bdYxGAU=";
|
||||
|
||||
mypy-boto3-cloudfront =
|
||||
buildMypyBoto3Package "cloudfront" "1.38.4"
|
||||
"sha256-bXulSRWwE2XEXXtpRflwsWn4PlFAyfiqR/Ed0/pMPQ4=";
|
||||
buildMypyBoto3Package "cloudfront" "1.38.12"
|
||||
"sha256-2ilPIDK1bdMkn69PXs2Q4HUhfG67XWjPWZHPr9ZyXvs=";
|
||||
|
||||
mypy-boto3-cloudhsm =
|
||||
buildMypyBoto3Package "cloudhsm" "1.38.0"
|
||||
@@ -294,8 +294,8 @@ rec {
|
||||
"sha256-twmdIgbVpRFwUcRu0Kyoti+Y1KCPmRgaCsf6Kozhmg8=";
|
||||
|
||||
mypy-boto3-codepipeline =
|
||||
buildMypyBoto3Package "codepipeline" "1.38.0"
|
||||
"sha256-xZ4+zTLVTEmfQ6nLwglF4pjeBqoz3dywPjhgBFr89ng=";
|
||||
buildMypyBoto3Package "codepipeline" "1.38.12"
|
||||
"sha256-HTZJEjSM1J/lQPFSDIRDQZW8DdskT4L9Te6zPUoqT8c=";
|
||||
|
||||
mypy-boto3-codestar =
|
||||
buildMypyBoto3Package "codestar" "1.35.0"
|
||||
@@ -446,8 +446,8 @@ rec {
|
||||
"sha256-RQh46jrXqj4bXTRJ+tPR9sql7yUn7Ek9u4p0OU0A7b0=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.38.11"
|
||||
"sha256-ZNev1egHwJsXGa8HQBaxZUma2ZEnrFqT6xK+68dExgw=";
|
||||
buildMypyBoto3Package "ec2" "1.38.12"
|
||||
"sha256-NpOkYFCgUxUbk6SJXYWYN5/FMGs8aIzBVe/NhkLUoR0=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.38.0"
|
||||
@@ -574,8 +574,8 @@ rec {
|
||||
"sha256-abALPaOoxM8dvwqd8j41mTT1Zmcn/sEVzlopSMc+fYM=";
|
||||
|
||||
mypy-boto3-glue =
|
||||
buildMypyBoto3Package "glue" "1.38.0"
|
||||
"sha256-J6eSeVhhaNmtSqxvQ7w3F5EfVpGsliKn73AQSGo361k=";
|
||||
buildMypyBoto3Package "glue" "1.38.12"
|
||||
"sha256-0McJ3i8jtqknfsA7sN9P7+IOMqbHSFMQScF9g0m8Wgk=";
|
||||
|
||||
mypy-boto3-grafana =
|
||||
buildMypyBoto3Package "grafana" "1.38.0"
|
||||
@@ -594,8 +594,8 @@ rec {
|
||||
"sha256-GkC4iF96d4nQMNZZx2JHBvgdFvzqujmH2YLzEuiM1n8=";
|
||||
|
||||
mypy-boto3-guardduty =
|
||||
buildMypyBoto3Package "guardduty" "1.38.0"
|
||||
"sha256-2R+q3YsJFStb5pUj9LNPwZOZd3HqP54q5j1RhcJj3cA=";
|
||||
buildMypyBoto3Package "guardduty" "1.38.12"
|
||||
"sha256-mKzD4xUXunOsxxTXJIoV0ardgVkhvr57KqRLxj2KhPk=";
|
||||
|
||||
mypy-boto3-health =
|
||||
buildMypyBoto3Package "health" "1.38.0"
|
||||
@@ -1314,8 +1314,8 @@ rec {
|
||||
"sha256-qiG1fAHlB0AfSzdQXaLWpyQW9AB2BUfU/aUWW6NbKl8=";
|
||||
|
||||
mypy-boto3-sso-admin =
|
||||
buildMypyBoto3Package "sso-admin" "1.38.0"
|
||||
"sha256-sZDz1F8V9XfebNZ+fsfOAGR8rqymD4O7b0/v6sV3FTs=";
|
||||
buildMypyBoto3Package "sso-admin" "1.38.12"
|
||||
"sha256-RU8IFZVVcJeO4lRa9DG87ue5YPhkqtJB6qjBKG4FZeo=";
|
||||
|
||||
mypy-boto3-sso-oidc =
|
||||
buildMypyBoto3Package "sso-oidc" "1.38.0"
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nexia";
|
||||
version = "2.8.0";
|
||||
version = "2.10.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = "nexia";
|
||||
tag = version;
|
||||
hash = "sha256-nDlOMcBCmPHKvbLLrfRNPBpG9qFpJqzdkluOLnyxUfs=";
|
||||
hash = "sha256-5gx66PVyrpL/9EXEWsHxKZVHmpfOKluN3LLok2qW3oU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ossfs";
|
||||
version = "2023.12.0";
|
||||
version = "2025.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "fsspec";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
hash = "sha256-N1NkpI8inGJCf0xuc+FFmVX85CS7vqzoNddxZ9kqEk0=";
|
||||
hash = "sha256-2i7zxLCi4wNCwzWNUbC6lvvdRkK+ksUWds+H6QG6bW4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -47,7 +47,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Filesystem for Alibaba Cloud (Aliyun) Object Storage System (OSS)";
|
||||
homepage = "https://github.com/fsspec/ossfs";
|
||||
changelog = "https://github.com/fsspec/ossfs/releases/tag/${version}";
|
||||
changelog = "https://github.com/fsspec/ossfs/releases/tag/${src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
libX11,
|
||||
portmidi,
|
||||
SDL2_classic,
|
||||
SDL2_image,
|
||||
SDL2_mixer,
|
||||
SDL2_ttf,
|
||||
SDL2_classic_image,
|
||||
SDL2_classic_mixer_2_0,
|
||||
SDL2_classic_ttf,
|
||||
numpy,
|
||||
|
||||
pygame-gui,
|
||||
@@ -99,9 +99,9 @@ buildPythonPackage rec {
|
||||
libpng
|
||||
portmidi
|
||||
SDL2_classic
|
||||
(SDL2_image.override { enableSTB = false; })
|
||||
SDL2_mixer
|
||||
SDL2_ttf
|
||||
(SDL2_classic_image.override { enableSTB = false; })
|
||||
SDL2_classic_mixer_2_0
|
||||
SDL2_classic_ttf
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user