Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -501,7 +501,7 @@ writeTextFile {
|
||||
text = ''
|
||||
Contents of File
|
||||
'';
|
||||
destination = "share/my-file";
|
||||
destination = "/share/my-file";
|
||||
}
|
||||
```
|
||||
|
||||
@@ -586,7 +586,7 @@ writeTextFile {
|
||||
echo "hi"
|
||||
'';
|
||||
executable = true;
|
||||
destination = "bin/my-script";
|
||||
destination = "/bin/my-script";
|
||||
}
|
||||
```
|
||||
|
||||
@@ -674,7 +674,7 @@ writeTextFile {
|
||||
echo "hi"
|
||||
'';
|
||||
executable = true;
|
||||
destination = "bin/my-script";
|
||||
destination = "/bin/my-script";
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
@@ -19339,6 +19339,12 @@
|
||||
github = "kf5grd";
|
||||
githubId = 18297490;
|
||||
};
|
||||
shogo = {
|
||||
email = "shouryagoel10000@gmail.com";
|
||||
github = "Sh0g0-1758";
|
||||
githubId = 114918019;
|
||||
name = "Shourya Goel";
|
||||
};
|
||||
shortcord = {
|
||||
name = "Short Cord";
|
||||
email = "short@shortcord.com";
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
[2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24).
|
||||
Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life improvements.
|
||||
|
||||
- GCC now defaults to major version 14 from previous 13. ([GCC Porting Guide](https://gcc.gnu.org/gcc-14/porting_to.html))
|
||||
|
||||
- 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.
|
||||
|
||||
@@ -18,15 +18,15 @@ in {
|
||||
type = lib.types.submodule {
|
||||
freeformType = format.type;
|
||||
options = {
|
||||
Touch = {
|
||||
Touchscreen = {
|
||||
DisableOnPalm = lib.mkOption {
|
||||
default = false;
|
||||
description = "Ignore all touch inputs if a palm was registered on the display.";
|
||||
description = "Ignore all touchscreen inputs if a palm was registered on the display.";
|
||||
type = lib.types.bool;
|
||||
};
|
||||
DisableOnStylus = lib.mkOption {
|
||||
default = false;
|
||||
description = "Ignore all touch inputs if a stylus is in proximity.";
|
||||
description = "Ignore all touchscreen inputs if a stylus is in proximity.";
|
||||
type = lib.types.bool;
|
||||
};
|
||||
};
|
||||
@@ -43,6 +43,10 @@ in {
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
warnings = lib.optional (lib.hasAttr "Touch" cfg.config) ''
|
||||
The option `services.iptsd.config.Touch` has been renamed to `services.iptsd.config.Touchscreen`.
|
||||
'';
|
||||
|
||||
systemd.packages = [ pkgs.iptsd ];
|
||||
environment.etc."iptsd.conf".source = configFile;
|
||||
systemd.services."iptsd@".restartTriggers = [ configFile ];
|
||||
|
||||
@@ -16,6 +16,7 @@ let
|
||||
with upstreamPatches;
|
||||
[
|
||||
QUBES_REPRODUCIBLE_BUILDS
|
||||
XSA_462
|
||||
]
|
||||
);
|
||||
in
|
||||
|
||||
@@ -16,6 +16,7 @@ let
|
||||
with upstreamPatches;
|
||||
[
|
||||
QUBES_REPRODUCIBLE_BUILDS
|
||||
XSA_462
|
||||
]
|
||||
);
|
||||
in
|
||||
|
||||
@@ -18,6 +18,7 @@ let
|
||||
QUBES_REPRODUCIBLE_BUILDS
|
||||
XSA_460
|
||||
XSA_461
|
||||
XSA_462
|
||||
]
|
||||
);
|
||||
in
|
||||
|
||||
@@ -134,4 +134,26 @@ in
|
||||
cve = [ "CVE-2024-31146" ];
|
||||
hash = "sha256-JQWoqf47hy9WXNkVC/LgmjUhkxN0SBF6w8PF4aFZxhM=";
|
||||
};
|
||||
# Xen Security Advisory #462: (4.16.6 - 4.19.0)
|
||||
"XSA_462" = xsaPatch {
|
||||
id = "462";
|
||||
title = "x86: Deadlock in vlapic_error()";
|
||||
description = ''
|
||||
In x86's APIC (Advanced Programmable Interrupt Controller) architecture,
|
||||
error conditions are reported in a status register. Furthermore, the OS
|
||||
can opt to receive an interrupt when a new error occurs.
|
||||
|
||||
It is possible to configure the error interrupt with an illegal vector,
|
||||
which generates an error when an error interrupt is raised.
|
||||
|
||||
This case causes Xen to recurse through vlapic_error(). The recursion
|
||||
itself is bounded; errors accumulate in the the status register and only
|
||||
generate an interrupt when a new status bit becomes set.
|
||||
|
||||
However, the lock protecting this state in Xen will try to be taken
|
||||
recursively, and deadlock.
|
||||
'';
|
||||
cve = [ "CVE-2024-45817" ];
|
||||
hash = "sha256-01lzjaT2f69UfEdTUCkm92DDOmd+Mo8sNPZsHJfgJEM=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -86,6 +86,13 @@ rec {
|
||||
, preferLocalBuild ? true
|
||||
, derivationArgs ? { }
|
||||
}:
|
||||
assert lib.assertMsg (destination != "" -> (lib.hasPrefix "/" destination && destination != "/")) ''
|
||||
destination must be an absolute path, relative to the derivation's out path,
|
||||
got '${destination}' instead.
|
||||
|
||||
Ensure that the path starts with a / and specifies at least the filename.
|
||||
'';
|
||||
|
||||
let
|
||||
matches = builtins.match "/bin/([^/]+)" destination;
|
||||
in
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aiken";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aiken-lang";
|
||||
repo = "aiken";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-os8OqLX6vxHQvrn+X8/BeYnfZJSKG7GDScz7ikJ4sl8=";
|
||||
hash = "sha256-n373MgPjJzP+yRSQLA07RijFBjbRItK/nX8k7SJ6ITE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7VoTL9W9KboBhhxB9nkzPag6IR/RsXZUDVXjdzOITVM=";
|
||||
cargoHash = "sha256-gQ7DfYyVF6Gk8N+spBd97BWxTwydq+lDbnCsVPPzWLU=";
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
{
|
||||
lib,
|
||||
clangStdenv,
|
||||
fetchFromGitHub,
|
||||
re2c,
|
||||
z3,
|
||||
hiredis,
|
||||
llvm_18,
|
||||
cmake,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alive2";
|
||||
version = "0-unstable-2024-09-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AliveToolkit";
|
||||
repo = "alive2";
|
||||
rev = "05a964284056b38a6dc1f807e7acad64a0308328";
|
||||
sha256 = "sha256-okKKUU7WLXLD9Hvsfoz+1HQWoyQ/bqRpBk5ogr7kSJA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
buildInputs = [
|
||||
re2c
|
||||
z3
|
||||
hiredis
|
||||
llvm_18
|
||||
ninja
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'find_package(Git REQUIRED)' ""
|
||||
'';
|
||||
|
||||
env = {
|
||||
ALIVE2_HOME = "$PWD";
|
||||
LLVM2_HOME = "${llvm_18}";
|
||||
LLVM2_BUILD = "$LLVM2_HOME/build";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp alive $out/bin/
|
||||
cp alive-jobserver $out/bin/
|
||||
rm -rf $out/bin/CMakeFiles $out/bin/*.o
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Automatic verification of LLVM optimizations";
|
||||
homepage = "https://github.com/AliveToolkit/alive2";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ shogo ];
|
||||
mainProgram = "alive";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
boost,
|
||||
cmake,
|
||||
doxygen,
|
||||
fetchFromGitHub,
|
||||
fontconfig,
|
||||
gepetto-viewer,
|
||||
lib,
|
||||
pkg-config,
|
||||
python3Packages,
|
||||
libsForQt5,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gepetto-viewer-corba";
|
||||
version = "5.8.0";
|
||||
pyproject = false; # CMake
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gepetto";
|
||||
repo = "gepetto-viewer-corba";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \
|
||||
--replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES}
|
||||
'';
|
||||
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
libsForQt5.wrapQtAppsHook
|
||||
pkg-config
|
||||
python3Packages.omniorb
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.boost
|
||||
python3Packages.gepetto-viewer
|
||||
python3Packages.omniorbpy
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
|
||||
# Fontconfig error: No writable cache directories
|
||||
preBuild = "export XDG_CACHE_HOME=$(mktemp -d)";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/gepetto/gepetto-viewer-corba";
|
||||
description = "CORBA client/server for gepetto-viewer.";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.nim65s ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,136 @@
|
||||
{
|
||||
boost,
|
||||
cmake,
|
||||
darwin,
|
||||
doxygen,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fontconfig,
|
||||
lib,
|
||||
jrl-cmakemodules,
|
||||
libsForQt5,
|
||||
makeWrapper,
|
||||
openscenegraph,
|
||||
osgqt,
|
||||
pkg-config,
|
||||
python3Packages,
|
||||
qgv,
|
||||
stdenv,
|
||||
runCommand,
|
||||
}:
|
||||
let
|
||||
gepetto-viewer = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gepetto-viewer";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gepetto";
|
||||
repo = "gepetto-viewer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix use of CMAKE_INSTALL_BINDIR for $bin output
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch";
|
||||
hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs=";
|
||||
})
|
||||
# fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch";
|
||||
hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.isDarwin))
|
||||
(lib.cmakeBool "BUILD_PY_QGV" (!stdenv.isDarwin))
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"bin"
|
||||
"doc"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3Packages.boost
|
||||
python3Packages.python-qt
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
libsForQt5.wrapQtAppsHook
|
||||
pkg-config
|
||||
python3Packages.python
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ darwin.autoSignDarwinBinariesHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jrl-cmakemodules
|
||||
openscenegraph
|
||||
osgqt
|
||||
qgv
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# wrapQtAppsHook uses isMachO, which fails to detect binaries without this
|
||||
# ref. https://github.com/NixOS/nixpkgs/pull/138334
|
||||
preFixup = lib.optionalString stdenv.isDarwin "export LC_ALL=C";
|
||||
|
||||
postFixup = ''
|
||||
# CMake is not aware exports are in $dev
|
||||
substituteInPlace $dev/lib/cmake/gepetto-viewer/gepetto-viewerConfig.cmake --replace-fail \
|
||||
"$out/lib/cmake" \
|
||||
"$dev/lib/cmake"
|
||||
|
||||
# wrapQtAppsHook does only wrap stuff in $out, we want $bin
|
||||
echo wrapping $bin/bin/gepetto-gui
|
||||
wrapQtApp $bin/bin/gepetto-gui
|
||||
'';
|
||||
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
|
||||
# Fontconfig error: No writable cache directories
|
||||
preBuild = "export XDG_CACHE_HOME=$(mktemp -d)";
|
||||
|
||||
passthru.withPlugins =
|
||||
plugins:
|
||||
runCommand "gepetto-gui"
|
||||
{
|
||||
meta = {
|
||||
# can't just "inherit (gepetto-viewer) meta;" because:
|
||||
# error: derivation '/nix/store/…-gepetto-gui.drv' does not have wanted outputs 'bin'
|
||||
inherit (gepetto-viewer.meta)
|
||||
description
|
||||
homepage
|
||||
license
|
||||
maintainers
|
||||
mainProgram
|
||||
platforms
|
||||
;
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
propagatedBuildInputs = plugins;
|
||||
}
|
||||
''
|
||||
makeWrapper ${lib.getExe gepetto-viewer} $out/bin/gepetto-gui \
|
||||
--set GEPETTO_GUI_PLUGIN_DIRS ${lib.makeLibraryPath plugins}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Graphical Interface for Pinocchio and HPP.";
|
||||
homepage = "https://github.com/gepetto/gepetto-viewer";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = [ lib.maintainers.nim65s ];
|
||||
mainProgram = "gepetto-gui";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
});
|
||||
in
|
||||
gepetto-viewer
|
||||
@@ -69,13 +69,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "3672";
|
||||
version = "3772";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-m9mMmvIasoJkj0DAx/6TLdt5Qflbe1JqaU1VQ/8bEG0=";
|
||||
hash = "sha256-gJFCFhppaXs/9GReEjEZiU/BZ51pjl7IBsUN04uTls0=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lms";
|
||||
version = "3.57.0";
|
||||
version = "3.58.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epoupon";
|
||||
repo = "lms";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KeskFVTZMxsFefbjnRBfrbS88Wt+2kwzboDziBsZJrY=";
|
||||
hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nerdfetch";
|
||||
version = "8.2.1";
|
||||
version = "8.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThatOneCalculator";
|
||||
repo = "NerdFetch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9S7mS+lUCT8/Q65fqlrnTksuK3mhynPX+jWPaV8U8Dg=";
|
||||
hash = "sha256-CQjIxXGuEUdUbbdclVKshsz/AdkgDTTACoNCVFrHqas=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
libsForQt5,
|
||||
openscenegraph,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "osgQt";
|
||||
version = "3.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openscenegraph";
|
||||
repo = "osgQt";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-iUeIqRDlcAHdKXWAi4WhEaOCxa7ZivQw0K5E7ccEKnM=";
|
||||
};
|
||||
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ openscenegraph ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDESIRED_QT_VERSION=5"
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"FIND_PACKAGE(Qt5Widgets REQUIRED)" \
|
||||
"FIND_PACKAGE(Qt5Widgets REQUIRED)
|
||||
FIND_PACKAGE(Qt5OpenGL REQUIRED)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Qt bindings for OpenSceneGraph";
|
||||
homepage = "https://github.com/openscenegraph/osgQt";
|
||||
license = "OpenSceneGraph Public License - free LGPL-based license";
|
||||
maintainers = [ lib.maintainers.nim65s ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
graphviz,
|
||||
jrl-cmakemodules,
|
||||
lib,
|
||||
libsForQt5,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qgv";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gepetto";
|
||||
repo = "qgv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-NUMCVqXw7euwxm4vISU8qYFfvV5HbAJsj/IjyxEjCPw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
graphviz
|
||||
jrl-cmakemodules
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Interactive Qt graphViz display";
|
||||
homepage = "https://github.com/gepetto/qgv";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = [ lib.maintainers.nim65s ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -1,23 +1,24 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, cacert
|
||||
, nixosTests
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cacert,
|
||||
nixosTests,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
darwin,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "redlib";
|
||||
version = "0.35.1";
|
||||
version = "0.35.1-unstable-2024-09-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redlib-org";
|
||||
repo = "redlib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-W1v7iOE60/6UyZSHQW+L+wHCoKnKUNb3kpm4LVLPZ6c=";
|
||||
rev = "d5f137ce47de39e2c8c4ed09d13ba1f809bee560";
|
||||
hash = "sha256-12XKeBCKciKummI43oTbKGkkY0mghA82ir2C3LhnwSs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3NQWiu/nTtHrivYL1pgxqQxEuIW0xfjxwK0ZEa2y1Kk=";
|
||||
cargoHash = "sha256-XSmeJAK18J9WxrG5orFbAB9hWVLQQ50oB223oHT3OOk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
@@ -25,18 +26,25 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
checkFlags = [
|
||||
# All these test try to connect to Reddit.
|
||||
# utils.rs
|
||||
"--skip=test_fetching_subreddit_quarantined"
|
||||
"--skip=test_fetching_nsfw_subreddit"
|
||||
"--skip=test_fetching_ws"
|
||||
|
||||
# client.rs
|
||||
"--skip=test_obfuscated_share_link"
|
||||
"--skip=test_share_link_strip_json"
|
||||
|
||||
"--skip=test_localization_popular"
|
||||
|
||||
# subreddit.rs
|
||||
"--skip=test_fetching_subreddit"
|
||||
"--skip=test_gated_and_quarantined"
|
||||
|
||||
# user.rs
|
||||
"--skip=test_fetching_user"
|
||||
|
||||
# These try to connect to the oauth client
|
||||
# oauth.rs
|
||||
"--skip=test_oauth_client"
|
||||
"--skip=test_oauth_client_refresh"
|
||||
"--skip=test_oauth_token_exists"
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2024-09-05";
|
||||
version = "0-unstable-2024-09-20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "3444d8aa86bb4ad3907c7d6886feafd65b8c2ff8";
|
||||
hash = "sha256-aHSuu9dYmY4ZKs6bzJostzeO1hFgkt/VBAbs2Ntj6dU=";
|
||||
rev = "b54beb5568509ed8dce6a43efa02a600e271a32f";
|
||||
hash = "sha256-behdFayLes2Hr12KZ472jzTnELHMWRp3D5h6ZxLtqic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "1.0-unstable-2024-08-29";
|
||||
version = "1.0-unstable-2024-09-20";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "ea4aaca2a6e5bc1623bbd2bd892a6eff31439fcc";
|
||||
hash = "sha256-1LA9IwnWcnr5fS1VP2wLWk6zNxNzJQ1VqAw5BsHz7tA=";
|
||||
rev = "f8c53f59b012dd56d44ae50cdf90dd1dad6cce23";
|
||||
hash = "sha256-Ee4hN3OnqF/OhKieGtzT4XOhNJIhywCgP6Us0DZTVBI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
||||
Generated
+2
-2
@@ -4556,7 +4556,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "wlx-capture"
|
||||
version = "0.3.12"
|
||||
source = "git+https://github.com/galister/wlx-capture?tag=v0.3.12#14d2b8a13dad62849973fe90bed7be262aa07143"
|
||||
source = "git+https://github.com/galister/wlx-capture?tag=v0.3.13#c375a7c1d4b57741655a052ebe8af9fb4774f92d"
|
||||
dependencies = [
|
||||
"ashpd",
|
||||
"drm-fourcc",
|
||||
@@ -4574,7 +4574,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wlx-overlay-s"
|
||||
version = "0.4.4"
|
||||
version = "0.5.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"ash",
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wlx-overlay-s";
|
||||
version = "0.4.4";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "galister";
|
||||
repo = "wlx-overlay-s";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+pWhtaYOzh7LPSCQeUTlU+/IxtcQTqRci9X7xEUV18U=";
|
||||
hash = "sha256-FuhpHByeiUwB14+WHZ7ssJ8YPphs06jPcMhxiGfiaU8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk=";
|
||||
"ovr_overlay-0.0.0" = "sha256-5IMEI0IPTacbA/1gibYU7OT6r+Bj+hlQjDZ3Kg0L2gw=";
|
||||
"vulkano-0.34.0" = "sha256-o1KP/mscMG5j3U3xtei/2nMNEh7jLedcW1P0gL9Y1Rc=";
|
||||
"wlx-capture-0.3.12" = "sha256-rZTJp7VhUvE/6lwESW2jKeGweFut6BvcxouG/nyl+GE=";
|
||||
"wlx-capture-0.3.12" = "sha256-32WnAnNUSfsAA8WB9da3Wqb4acVlXh6HWsY9tPzCHEE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "level-zero";
|
||||
version = "1.17.28";
|
||||
version = "1.17.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "level-zero";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rgQ7B3RZemlcurEQ8bwvlvJAypzHTOBqpowasziZCiQ=";
|
||||
hash = "sha256-IjYRzjC7CUPDdVBVoWSZtUQaY7QtSfS/Nej/2BdVziY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake addDriverRunpath ];
|
||||
|
||||
@@ -224,10 +224,6 @@ let
|
||||
rmdir $etc/etc/ssl/{certs,private}
|
||||
'' + lib.optionalString (conf != null) ''
|
||||
cat ${conf} > $etc/etc/ssl/openssl.cnf
|
||||
'' + lib.optionalString (lib.versionAtLeast version "3.3.0") ''
|
||||
# cleanup cmake helpers for now (for OpenSSL >= 3.3), only rely on pkg-config.
|
||||
# pkg-config gets its paths fixed correctly
|
||||
rm -rf $dev/lib/cmake
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
@@ -237,6 +233,10 @@ let
|
||||
echo "Found an erroneous dependency on perl ^^^" >&2
|
||||
exit 1
|
||||
fi
|
||||
'' + lib.optionalString (lib.versionAtLeast version "3.3.0") ''
|
||||
# cleanup cmake helpers for now (for OpenSSL >= 3.3), only rely on pkg-config.
|
||||
# pkg-config gets its paths fixed correctly
|
||||
rm -rf $dev/lib/cmake
|
||||
'';
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
@@ -48,7 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install_name_tool -id \
|
||||
$out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \
|
||||
$out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib
|
||||
install_name_tool -id \
|
||||
install_name_tool -change \
|
||||
libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \
|
||||
$out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \
|
||||
-id \
|
||||
$out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \
|
||||
$out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib
|
||||
'';
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
apischema,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
gql,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
pyjwt,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioaseko";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@@ -19,14 +20,15 @@ buildPythonPackage rec {
|
||||
owner = "milanmeu";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X2H+5roq5yNXET23Q3QNmYmG1oAFfvuvSsInsJi42/s=";
|
||||
hash = "sha256-jUvpu/lOFKRUwEuYD1zRp0oODjf4AgH84fnGngtv9jw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
pyjwt
|
||||
apischema
|
||||
gql
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airgradient";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "airgradienthq";
|
||||
repo = "python-airgradient";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NONOfM61oCtiNgmKCXvkEvCzSjumwjaeuzg9l/7hX8M=";
|
||||
hash = "sha256-BBJ9pYE9qAE62FJFwycWBnvsoeobjsg0uIDZffIg18o=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
owner = "Farama-Foundation";
|
||||
repo = "Arcade-Learning-Environment";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JQG8Db7OEKQ7THkHJ+foUm/L7Ctr0Ur8nb6Zc2Z/MJI=";
|
||||
hash = "sha256-tdxO5eixI2swezhkeSMqeVgdiaa/VmNdwhZYURSzadw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cohere";
|
||||
version = "5.9.2";
|
||||
version = "5.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cohere-ai";
|
||||
repo = "cohere-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7vyaKrMpD1DPe8qptprsAK24kzAwSL4fu53uEqJ1VWE=";
|
||||
hash = "sha256-RtBbS2t0298EyW30yRnqstmXkiU36tou0dsbf6Tq1xE=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@@ -31,8 +30,6 @@ buildPythonPackage rec {
|
||||
version = "2024.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask-contrib";
|
||||
repo = "dask-awkward";
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@@ -21,16 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-expr";
|
||||
version = "1.1.11";
|
||||
version = "1.1.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = "dask-expr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-D26b8HkcRqsMuzSTZdmDmS59dlAbj4F93kfY27UAhKw=";
|
||||
hash = "sha256-yDNkIATN6AuGzcxTwAQyaQaDQ48v45hTC2fUqEThl/g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,10 +2,16 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
boost-histogram,
|
||||
dask,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
|
||||
# dependencies
|
||||
boost-histogram,
|
||||
dask,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
pythonAtLeast,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@@ -20,17 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-jobqueue";
|
||||
version = "0.8.5";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
# Python 3.12 support should be added in 0.8.6
|
||||
disabled = pythonOlder "3.8" || pythonAtLeast "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = "dask-jobqueue";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NBFfPTNIXezwv7f1P3VRnkBYlOutD30+8rdiBBssHDE=";
|
||||
hash = "sha256-YujfhjOJzl4xsjjsyrQkEu/CBR04RwJ79c1iSTcMIgw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -46,46 +42,54 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Require some unavailable pytest fixtures
|
||||
"test_adapt"
|
||||
"test_adaptive"
|
||||
"test_adaptive_cores_mem"
|
||||
"test_adaptive_grouped"
|
||||
"test_adapt_parameters"
|
||||
"test_basic"
|
||||
"test_basic_scale_edge_cases"
|
||||
"test_cluster"
|
||||
"test_cluster_error_scheduler_arguments_should_use_scheduler_options"
|
||||
"test_cluster_has_cores_and_memory"
|
||||
"test_command_template"
|
||||
"test_complex_cancel_command"
|
||||
"test_config"
|
||||
"test_dashboard_link"
|
||||
"test_default_number_of_worker_processes"
|
||||
"test_deprecation_env_extra"
|
||||
"test_deprecation_extra"
|
||||
"test_deprecation_job_extra"
|
||||
"test_different_interfaces_on_scheduler_and_workers"
|
||||
"test_docstring_cluster"
|
||||
"test_extra_args_broken_cancel"
|
||||
"test_forward_ip"
|
||||
"test_import_scheduler_options_from_config"
|
||||
"test_job"
|
||||
"test_jobqueue_job_call"
|
||||
"test_log_directory"
|
||||
"test_scale_cores_memory"
|
||||
"test_scale_grouped"
|
||||
"test_scheduler_options"
|
||||
"test_scheduler_options_interface"
|
||||
"test_security"
|
||||
"test_security_temporary"
|
||||
"test_security_temporary_defaults"
|
||||
"test_shebang_settings"
|
||||
"test_use_stdin"
|
||||
"test_worker_name_uses_cluster_name"
|
||||
"test_wrong_parameter_error"
|
||||
];
|
||||
disabledTests =
|
||||
[
|
||||
# Require some unavailable pytest fixtures
|
||||
"test_adapt"
|
||||
"test_adaptive"
|
||||
"test_adaptive_cores_mem"
|
||||
"test_adaptive_grouped"
|
||||
"test_adapt_parameters"
|
||||
"test_basic"
|
||||
"test_basic_scale_edge_cases"
|
||||
"test_cluster"
|
||||
"test_cluster_error_scheduler_arguments_should_use_scheduler_options"
|
||||
"test_cluster_has_cores_and_memory"
|
||||
"test_command_template"
|
||||
"test_complex_cancel_command"
|
||||
"test_config"
|
||||
"test_dashboard_link"
|
||||
"test_default_number_of_worker_processes"
|
||||
"test_deprecation_env_extra"
|
||||
"test_deprecation_extra"
|
||||
"test_deprecation_job_extra"
|
||||
"test_different_interfaces_on_scheduler_and_workers"
|
||||
"test_docstring_cluster"
|
||||
"test_extra_args_broken_cancel"
|
||||
"test_forward_ip"
|
||||
"test_import_scheduler_options_from_config"
|
||||
"test_job"
|
||||
"test_jobqueue_job_call"
|
||||
"test_log_directory"
|
||||
"test_scale_cores_memory"
|
||||
"test_scale_grouped"
|
||||
"test_scheduler_options"
|
||||
"test_scheduler_options_interface"
|
||||
"test_security"
|
||||
"test_security_temporary"
|
||||
"test_security_temporary_defaults"
|
||||
"test_shebang_settings"
|
||||
"test_use_stdin"
|
||||
"test_worker_name_uses_cluster_name"
|
||||
"test_wrong_parameter_error"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
# ValueError: invalid operation on non-started TCPListener
|
||||
"test_header"
|
||||
"test_lsf_unit_detection"
|
||||
"test_lsf_unit_detection_without_file"
|
||||
"test_runner"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dask_jobqueue" ];
|
||||
|
||||
|
||||
@@ -34,22 +34,19 @@
|
||||
pytest-rerunfailures,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "2024.8.1";
|
||||
version = "2024.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = "dask";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ztB5T8VFc1WoQB7lWQlonAyq7duqft9OE5FYvmjZd48=";
|
||||
hash = "sha256-CaTxhYT2diFOBylLH36iIR1ooWzi2e/RNOnvc11DtDY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,40 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
versioneer,
|
||||
|
||||
# dependencies
|
||||
click,
|
||||
cloudpickle,
|
||||
dask,
|
||||
fetchFromGitHub,
|
||||
jinja2,
|
||||
locket,
|
||||
msgpack,
|
||||
packaging,
|
||||
psutil,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
sortedcontainers,
|
||||
tblib,
|
||||
toolz,
|
||||
tornado,
|
||||
urllib3,
|
||||
versioneer,
|
||||
zict,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "distributed";
|
||||
version = "2024.8.2";
|
||||
version = "2024.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = "distributed";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RvaWczbj/afOqTo9WPLJBkPG6li/TUwe84NS08zQMtY=";
|
||||
hash = "sha256-jzifqTGHAto+7LExUs0kSd8852EfELEL8acSElXlEx0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -22,16 +22,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minio";
|
||||
version = "7.2.8";
|
||||
version = "7.2.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio-py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BWzG8qYfTxk59lRAAL78YFCuHku8L2VxCSNpbi8Dr3k=";
|
||||
hash = "sha256-ObbU0skqNBebkmX5gtJ9/QHlSZFB3tvaFnitmD+lKBc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -39,9 +39,9 @@ buildPythonPackage rec {
|
||||
--replace-fail "assertEquals" "assertEqual"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
argon2-cffi
|
||||
certifi
|
||||
urllib3
|
||||
|
||||
+24
-20
@@ -1,54 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchurl,
|
||||
omniorb,
|
||||
pkg-config,
|
||||
python3,
|
||||
python,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
buildPythonPackage rec {
|
||||
pname = "omniorbpy";
|
||||
version = "4.3.2";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${finalAttrs.version}.tar.bz2";
|
||||
url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${version}.tar.bz2";
|
||||
hash = "sha256-y1cX1BKhAbr0MPWYysfWkjGITa5DctjirfPd7rxffrs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
omniorb
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
propagatedBuildInputs = [ omniorb ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-omniorb=${omniorb}"
|
||||
"PYTHON_PREFIX=$out"
|
||||
"PYTHON=${lib.getExe python3}"
|
||||
"PYTHON=${python.interpreter}"
|
||||
];
|
||||
|
||||
# Transform omniidl_be into a PEP420 namespace
|
||||
postInstall = ''
|
||||
rm $out/${python3.sitePackages}/omniidl_be/__init__.py
|
||||
rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc
|
||||
rm $out/${python.sitePackages}/omniidl_be/__init__.py
|
||||
rm $out/${python.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc
|
||||
'';
|
||||
|
||||
# Ensure both python & cxx backends are available
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
export PYTHONPATH=$out/${python3.sitePackages}:${omniorb}/${python3.sitePackages}:$PYTHONPATH
|
||||
${lib.getExe python3} -c "import omniidl_be.cxx; import omniidl_be.python"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"omniidl_be.cxx"
|
||||
"omniidl_be.python"
|
||||
"omniORB"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python backend for omniorb";
|
||||
homepage = "http://omniorb.sourceforge.net";
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
license = with licenses; [
|
||||
gpl2Plus
|
||||
lgpl21Plus
|
||||
];
|
||||
maintainers = with maintainers; [ nim65s ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynmeagps";
|
||||
version = "1.0.41";
|
||||
version = "1.0.42";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "semuconsulting";
|
||||
repo = "pynmeagps";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-c80OACBwohlTBGvBZValv+AMOKLd32PrPf/JzqETjDU=";
|
||||
hash = "sha256-hlGqc4vZ/C98vQwJewK0cfC3zP9xyO0oXXtlyNUDg0Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
|
||||
# dependencies
|
||||
aiohttp,
|
||||
@@ -52,12 +51,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spyder";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/UUtSpSkt1hJeIZfBLe8owP82jRx02kUF6TdfCsq6CY=";
|
||||
hash = "sha256-cJeC6ICRWIu+YU3m673ntHVEpNbCJeGZ3lrSK3fYsTA=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-clear-pythonpath.patch ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1237";
|
||||
version = "3.0.1238";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5pzdj+Es0JunISOCID5KJ+cR42EjD+c0Pt/B9dVJw2k=";
|
||||
hash = "sha256-+cLGJA4iZvcrzk5R7J/7l7oSQeU6DuhkChldndSOFEM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, unittestCheckHook
|
||||
, six
|
||||
, stdenv
|
||||
}:
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ nose ];
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
# iterable = range(10 ** 10) # Is efficiently reversible
|
||||
|
||||
@@ -10,11 +10,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bloop";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
|
||||
platform =
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"
|
||||
else if stdenv.isDarwin && stdenv.isAarch64 then "aarch64-apple-darwin"
|
||||
else throw "unsupported platform";
|
||||
|
||||
bloop-bash = fetchurl {
|
||||
@@ -35,8 +36,9 @@ stdenv.mkDerivation rec {
|
||||
bloop-binary = fetchurl rec {
|
||||
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
|
||||
sha256 =
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "sha256-SnDXAkNu//Dn24FaQcACEBEJODlrhvpQ8uNbge99nGA="
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-MfenrNbL1UBC4t/0w9MTDI+kz2HKv7xJcmA57qBbMFw="
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "sha256-xYVfgi3ANjBiuf4/5FDgSYDL/fPsvuJn4jFxAEVYct4="
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-lq0S2AsulcUUYDd3qnWonwd/W0/gb7lJwC+QTYTlTdg="
|
||||
else if stdenv.isDarwin && stdenv.isAarch64 then "sha256-e+9Q7xIEsHloaKOj13vZnGs2vulkOJv7tCOuACobHvk="
|
||||
else throw "unsupported platform";
|
||||
};
|
||||
|
||||
@@ -67,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.asl20;
|
||||
description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
|
||||
mainProgram = "bloop";
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
maintainers = with maintainers; [ kubukoz tomahna ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,12 +7,12 @@ let
|
||||
# kernel config in the xanmod version commit
|
||||
variants = {
|
||||
lts = {
|
||||
version = "6.6.51";
|
||||
hash = "sha256-dNUTePfL6cAA0EmEG/D36dNJUobDRBHR5+BYrLIYot4=";
|
||||
version = "6.6.52";
|
||||
hash = "sha256-bTsxESXY0uhx9/UjUg9cATC1ErfkxF1gH8TXimYVzX4=";
|
||||
};
|
||||
main = {
|
||||
version = "6.10.10";
|
||||
hash = "sha256-abxhlF0zmY9WvcQ+FnkR5fNMvrw+oTCIMaCs8DFJ+oA=";
|
||||
version = "6.10.11";
|
||||
hash = "sha256-FDWFpiN0VvzdXcS3nZHm1HFgASazNX5+pL/8UJ3hkI8=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
|
||||
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
|
||||
, ngtcp2-gnutls, xdp-tools
|
||||
, fstrm, protobufc
|
||||
, sphinx
|
||||
, autoreconfHook
|
||||
, nixosTests, knot-resolver, knot-dns, runCommandLocal
|
||||
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-configdir=/etc/knot"
|
||||
"--with-rundir=/run/knot"
|
||||
"--with-storage=/var/lib/knot"
|
||||
"--with-module-dnstap" "--enable-dnstap"
|
||||
];
|
||||
|
||||
patches = [
|
||||
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
ngtcp2-gnutls # DoQ support in kdig (and elsewhere but not much use there yet)
|
||||
libmaxminddb # optional for geoip module (it's tiny)
|
||||
# without sphinx &al. for developer documentation
|
||||
# TODO: add dnstap support?
|
||||
fstrm protobufc # dnstap support
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libcap_ng systemd
|
||||
xdp-tools libbpf libmnl # XDP support (it's Linux kernel API)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2024.9.2";
|
||||
version = "2024.9.3";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@@ -408,7 +408,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run update-component-packages.py after updating
|
||||
hassVersion = "2024.9.2";
|
||||
hassVersion = "2024.9.3";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qAnEdH1MDPsCKDubpYL5AswcsaPqGm+TrKdBcDD3np8=";
|
||||
hash = "sha256-W/qngUrc/R3lqdIWUFIXtP9IJ6t+VGdeAdJyZuGm94Q=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gWQU18GfnsxttRzpoN9WeNeHOgioTxF9DmG2SwNuzEY=";
|
||||
hash = "sha256-Qp1AiB89sq1OrAVR7qLEfX1j8kW8L2lb4Z1x4z4AzP0=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, home-assistant
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2024.9.2";
|
||||
version = "2024.9.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@@ -17,19 +18,20 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-o5bk63yErDOqNlYeGD7nMNuQ2p9rQuRYXlmfIMo8w8k=";
|
||||
hash = "sha256-ohk0Gxq+q7PH/+SRMEu4KFz/xoc/TDeuEzTnMjaYMBU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
hatchling
|
||||
hatch-vcs
|
||||
home-assistant
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Relax constraint to year and month
|
||||
substituteInPlace pyproject.toml --replace-fail \
|
||||
'homeassistant = "${version}"' \
|
||||
'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"'
|
||||
'homeassistant==${version}' \
|
||||
'homeassistant~=${lib.versions.majorMinor home-assistant.version}'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -14695,7 +14695,7 @@ with pkgs;
|
||||
|
||||
gbforth = callPackage ../development/compilers/gbforth { };
|
||||
|
||||
default-gcc-version = 14;
|
||||
default-gcc-version = 13;
|
||||
gcc = pkgs.${"gcc${toString default-gcc-version}"};
|
||||
gccFun = callPackage ../development/compilers/gcc;
|
||||
gcc-unwrapped = gcc.cc;
|
||||
@@ -20752,10 +20752,7 @@ with pkgs;
|
||||
|
||||
libantlr3c = callPackage ../development/libraries/libantlr3c { };
|
||||
|
||||
libaom = callPackage ../development/libraries/libaom {
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116737
|
||||
stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
|
||||
};
|
||||
libaom = callPackage ../development/libraries/libaom { };
|
||||
|
||||
libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
|
||||
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
|
||||
@@ -21948,10 +21945,7 @@ with pkgs;
|
||||
|
||||
libvisual = callPackage ../development/libraries/libvisual { };
|
||||
|
||||
libvmaf = callPackage ../development/libraries/libvmaf {
|
||||
# See libaom
|
||||
stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
|
||||
};
|
||||
libvmaf = callPackage ../development/libraries/libvmaf { };
|
||||
|
||||
libvncserver = callPackage ../development/libraries/libvncserver {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon;
|
||||
|
||||
@@ -4976,6 +4976,12 @@ self: super: with self; {
|
||||
|
||||
georss-wa-dfes-client = callPackage ../development/python-modules/georss-wa-dfes-client { };
|
||||
|
||||
gepetto-gui = toPythonModule (gepetto-viewer.withPlugins [ gepetto-viewer-corba ]);
|
||||
|
||||
gepetto-viewer-corba = toPythonModule (pkgs.gepetto-viewer-corba.override { python3Packages = self; });
|
||||
|
||||
gepetto-viewer = toPythonModule (pkgs.gepetto-viewer.override { python3Packages = self; });
|
||||
|
||||
gerbonara = callPackage ../development/python-modules/gerbonara { };
|
||||
|
||||
getjump = callPackage ../development/python-modules/getjump { };
|
||||
@@ -9071,6 +9077,8 @@ self: super: with self; {
|
||||
|
||||
python-nvd3 = callPackage ../development/python-modules/python-nvd3 { };
|
||||
|
||||
python-qt = toPythonModule (pkgs.python-qt.override { python3 = self.python; });
|
||||
|
||||
python-secp256k1-cardano = callPackage ../development/python-modules/python-secp256k1-cardano { };
|
||||
|
||||
python-tds = callPackage ../development/python-modules/python-tds { };
|
||||
@@ -9184,6 +9192,10 @@ self: super: with self; {
|
||||
|
||||
omnilogic = callPackage ../development/python-modules/omnilogic { };
|
||||
|
||||
omniorb = toPythonModule (pkgs.omniorb.override { python3 = self.python; });
|
||||
|
||||
omniorbpy = callPackage ../development/python-modules/omniorbpy { };
|
||||
|
||||
omorfi = callPackage ../development/python-modules/omorfi { };
|
||||
|
||||
omrdatasettools = callPackage ../development/python-modules/omrdatasettools { };
|
||||
|
||||
Reference in New Issue
Block a user