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

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-05 06:09:39 +00:00
committed by GitHub
parent ddcddd7b09 2674ce2142
commit 0fd41b3a38
123 changed files with 41783 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/using/overlays.chapter.md
+15 -15
View File
@@ -42,24 +42,24 @@ Because overlays that are set in NixOS configuration do not affect non-NixOS ope
## Defining overlays {#sec-overlays-definition}
Overlays are Nix functions which accept two arguments, conventionally called `self` and `super`, and return a set of packages. For example, the following is a valid overlay.
Overlays are Nix functions which accept two arguments, conventionally called either `final` and `prev` in newer code or `self` and `super` in older code, and return a set of packages. For example, the following is a valid overlay.
```nix
self: super:
final: prev:
{
boost = super.boost.override { python = self.python3; };
rr = super.callPackage ./pkgs/rr { stdenv = self.stdenv_32bit; };
boost = prev.boost.override { python = final.python3; };
rr = prev.callPackage ./pkgs/rr { stdenv = final.stdenv_32bit; };
}
```
The first argument (`self`) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of `rr` in the example above come from `self`, as well as the overridden dependencies used in the `boost` override.
The first argument (`final`, `self`) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of `rr` in the example above come from `final`, as well as the overridden dependencies used in the `boost` override.
The second argument (`super`) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of `boost` in the above example, comes from `super`, as well as the `callPackage` function.
The second argument (`prev`, `super`) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of `boost` in the above example, comes from `prev`, as well as the `callPackage` function.
The value returned by this function should be a set similar to `pkgs/top-level/all-packages.nix`, containing overridden and/or new packages.
Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in [](#sec-modify-via-packageOverrides). Indeed, `packageOverrides` acts as an overlay with only the `super` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute.
Overlays are similar to other methods for customizing Nixpkgs, in particular the `packageOverrides` attribute described in [](#sec-modify-via-packageOverrides). Indeed, `packageOverrides` acts as an overlay with only the `prev` argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute.
## Using overlays to configure alternatives {#sec-overlays-alternatives}
@@ -92,12 +92,12 @@ In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear
Introduced in [PR #83888](https://github.com/NixOS/nixpkgs/pull/83888), we are able to override the `blas` and `lapack` packages to use different implementations, through the `blasProvider` and `lapackProvider` argument. This can be used to select a different provider. BLAS providers will have symlinks in `$out/lib/libblas.so.3` and `$out/lib/libcblas.so.3` to their respective BLAS libraries. Likewise, LAPACK providers will have symlinks in `$out/lib/liblapack.so.3` and `$out/lib/liblapacke.so.3` to their respective LAPACK libraries. For example, Intel MKL is both a BLAS and LAPACK provider. An overlay can be created to use Intel MKL that looks like:
```nix
self: super:
final: prev:
{
blas = super.blas.override { blasProvider = self.mkl; };
blas = prev.blas.override { blasProvider = final.mkl; };
lapack = super.lapack.override { lapackProvider = self.mkl; };
lapack = prev.lapack.override { lapackProvider = final.mkl; };
}
```
@@ -112,12 +112,12 @@ Intel MKL requires an `openmp` implementation when running with multiple process
To override `blas` and `lapack` with its reference implementations (i.e. for development purposes), one can use the following overlay:
```nix
self: super:
final: prev:
{
blas = super.blas.override { blasProvider = self.lapack-reference; };
blas = prev.blas.override { blasProvider = final.lapack-reference; };
lapack = super.lapack.override { lapackProvider = self.lapack-reference; };
lapack = prev.lapack.override { lapackProvider = final.lapack-reference; };
}
```
@@ -152,9 +152,9 @@ All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Pas
To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, use the following overlay:
```nix
self: super:
final: prev:
{
mpi = self.mpich;
mpi = final.mpich;
}
```
pkgs/applications/backup/timeshift/unwrapped.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "timeshift";
version = "25.07.6";
version = "25.07.7";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "timeshift";
rev = version;
hash = "sha256-M3r5CUSMF2Es1EDolmZAwqj2uX76wARk5oefqdf2eYk=";
hash = "sha256-X3TwUkOeGzcgFM/4Fyfs8eQuGK2wHe3t13WSpIizX8s=";
};
postPatch = ''
pkgs/applications/editors/jupyter-kernels/xeus-cling/0003-Remove-unsupported-src-root-flag.patch
+85
View File
@@ -0,0 +1,85 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43718f5..d0d8670 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,8 +63,7 @@ if(LLVM_CONFIG)
"--bindir"
"--libdir"
"--includedir"
- "--prefix"
- "--src-root")
+ "--prefix")
execute_process(COMMAND ${CONFIG_COMMAND}
RESULT_VARIABLE HAD_ERROR
OUTPUT_VARIABLE CONFIG_OUTPUT)
diff --git a/src/xmagics/executable.cpp b/src/xmagics/executable.cpp
index 391c8c9..aba5e03 100644
--- a/src/xmagics/executable.cpp
+++ b/src/xmagics/executable.cpp
@@ -12,6 +12,7 @@
#include <iterator>
#include <fstream>
#include <memory>
+#include <optional>
#include <string>
#include <vector>
@@ -25,7 +26,7 @@
#include "clang/AST/ASTContext.h"
#include "clang/AST/DeclGroup.h"
#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Basic/DebugInfoOptions.h"
+#include "llvm/Frontend/Debug/Options.h"
#include "clang/Basic/Sanitizers.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/CodeGen/BackendUtil.h"
@@ -115,7 +116,7 @@ namespace xcpp
// Filter out functions added by Cling.
if (auto Identifier = D->getIdentifier())
{
- if (Identifier->getName().startswith("__cling"))
+ if (Identifier->getName().starts_with("__cling"))
{
return true;
}
@@ -153,12 +154,13 @@ namespace xcpp
if (EnableDebugInfo)
{
CodeGenOpts.setDebugInfo(
- clang::codegenoptions::DebugInfoKind::FullDebugInfo);
+ llvm::codegenoptions::DebugInfoKind::FullDebugInfo);
}
std::unique_ptr<clang::CodeGenerator> CG(clang::CreateLLVMCodeGen(
- CI->getDiagnostics(), "object", HeaderSearchOpts,
- CI->getPreprocessorOpts(), CodeGenOpts, *Context));
+ CI->getDiagnostics(), "object",
+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem>(&CI->getVirtualFileSystem()),
+ HeaderSearchOpts, CI->getPreprocessorOpts(), CodeGenOpts, *Context));
CG->Initialize(AST);
FindTopLevelDecls Visitor(CG.get());
@@ -186,7 +188,9 @@ namespace xcpp
EmitBackendOutput(CI->getDiagnostics(), HeaderSearchOpts,
CodeGenOpts, CI->getTargetOpts(),
CI->getLangOpts(), DataLayout, CG->GetModule(),
- clang::Backend_EmitObj, std::move(OS));
+ clang::Backend_EmitObj,
+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem>(&CI->getVirtualFileSystem()),
+ std::move(OS));
return true;
}
@@ -222,10 +226,10 @@ namespace xcpp
llvm::StringRef OutputFileStr(OutputFile);
llvm::StringRef ErrorFileStr(ErrorFile);
- llvm::SmallVector<llvm::Optional<llvm::StringRef>, 16> Redirects = {llvm::NoneType::None, OutputFileStr, ErrorFileStr};
+ llvm::SmallVector<std::optional<llvm::StringRef>, 16> Redirects = {std::nullopt, OutputFileStr, ErrorFileStr};
// Finally run the linker.
- int ret = llvm::sys::ExecuteAndWait(Compiler, Args, llvm::NoneType::None,
+ int ret = llvm::sys::ExecuteAndWait(Compiler, Args, std::nullopt,
Redirects);
// Read back output and error streams.
pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
+3 -2
View File
@@ -3,7 +3,7 @@
clangStdenv,
cmake,
fetchFromGitHub,
llvmPackages_13,
llvmPackages_18,
# Libraries
argparse,
cling,
@@ -65,6 +65,7 @@ clangStdenv.mkDerivation rec {
patches = [
./0001-Fix-bug-in-extract_filename.patch
./0002-Don-t-pass-extra-includes-configure-this-with-flags.patch
./0003-Remove-unsupported-src-root-flag.patch
];
nativeBuildInputs = [ cmake ];
@@ -73,7 +74,7 @@ clangStdenv.mkDerivation rec {
cling.unwrapped
cppzmq
libuuid
llvmPackages_13.llvm
llvmPackages_18.llvm
ncurses
openssl
pugixml
pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+22 -5
View File
@@ -1,6 +1,7 @@
{
lib,
stdenv,
fetchzip,
vscode-utils,
autoPatchelfHook,
icu,
@@ -17,29 +18,41 @@ let
{
x86_64-linux = {
arch = "linux-x64";
hash = "sha256-PlA1uuudUPnKCas5brviS8ZMDweFEdti6N5fu8XCzvY=";
hash = "sha256-FPhB2oWx5x/qr2k4sAg8w2Wx+LvW/Syfc/u8nnTCQFU=";
};
aarch64-linux = {
arch = "linux-arm64";
hash = "sha256-DyOT9AZAdW48G7SZfiFdveY9JwZDZjtT4Mp/LYY2JRk=";
hash = "sha256-qVZ9Go+/mVIoUr8Qt/kJv8gvOWd7NLu1wk7YZ2v6Lw8=";
};
x86_64-darwin = {
arch = "darwin-x64";
hash = "sha256-vew5YkrX7soPNiYO+KX5Uy2HOiJ701YWWZULtH5Aq+I=";
hash = "sha256-7G9t84clyi4T3k7FxoPIfaIs4VabBTvGilTptd3AHOw=";
};
aarch64-darwin = {
arch = "darwin-arm64";
hash = "sha256-rc6KVNZWNJYt8RkbqyPB4Q7aJB6jtlWMsd4UHGbqsoI=";
hash = "sha256-fmWlcLVUUY6Ekx5mtsBYFrYFdXpSUg8PctDBUovETV4=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
);
# Get url from runtimeDependencies in package.json
# TODO: Automate fetching runtimeDependencies from package.json
# ideally should be done at the vscode-extensions level for
# everyone to reuse.
roslyn-copilot = fetchzip {
url = "https://roslyn.blob.core.windows.net/releases/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer-18.0.479-alpha.zip";
hash = "sha256-xq66gY3N3/R9bG6XWqLy53T/ExzGdZi3ZBNEzYAeqM8=";
postFetch = ''
touch install.Lock
'';
};
in
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "csharp";
publisher = "ms-dotnettools";
version = "2.87.31";
version = "2.89.19";
inherit (extInfo) hash arch;
};
@@ -62,6 +75,10 @@ vscode-utils.buildVscodeMarketplaceExtension {
--replace-fail 'uname -m' '${lib.getExe' coreutils "uname"} -m'
'';
postInstall = ''
ln -s ${roslyn-copilot} "$out"/share/vscode/extensions/ms-dotnettools.csharp/.roslynCopilot
'';
preFixup = ''
(
set -euo pipefail
pkgs/applications/networking/cluster/nomad/default.nix
+5 -5
View File
@@ -40,10 +40,10 @@ let
inherit hash;
};
# Nomad requires Go 1.24.4, but nixpkgs doesn't have it in unstable yet.
# Nomad requires Go 1.24.6, but nixpkgs doesn't have it in unstable yet.
postPatch = ''
substituteInPlace go.mod \
--replace-warn "go 1.24.4" "go 1.24.3"
--replace-warn "go 1.24.6" "go 1.24.5"
'';
nativeBuildInputs = [ installShellFiles ];
@@ -90,9 +90,9 @@ rec {
nomad_1_10 = generic {
buildGoModule = buildGo124Module;
version = "1.10.3";
hash = "sha256-sDOo7b32H/d5OJ6CRyga1rZZk55bFTi4ynHL/aIH87w=";
vendorHash = "sha256-bpCnpeRk329vUd9e6x7iCh+1ouSGd4o4Hq79K0qchJ8=";
version = "1.10.4";
hash = "sha256-lQtKSU0wcrU+HEUc6N/svpf5uAaWK68G5kY/tI2Sy8Q=";
vendorHash = "sha256-tclD02oinoypx80TLni+DUpB5mYKRBqsmScp2VsUDc0=";
license = lib.licenses.bsl11;
passthru.tests.nomad = nixosTests.nomad;
preCheck = ''
pkgs/applications/networking/cluster/terraform-providers/providers.json
+6 -6
View File
@@ -1030,11 +1030,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-3KnXqCMvloBRT01Gfk8n9KSriSwP5FV8JPePevnPn60=",
"hash": "sha256-iRSd0olC82nr/Uzogg5DsiPAQIVLJRzM2wI9yubs/cw=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v3.28.1",
"rev": "v3.28.2",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1354,11 +1354,11 @@
"vendorHash": "sha256-M3wnvRxMyU0Yo733E9e8Q++xVTuSXD0W3fB2C14RDNU="
},
"tencentcloud": {
"hash": "sha256-dhhQxSIsFngZ/bcZ9a1ECo98A8lu+egSi9znVRUVkBQ=",
"hash": "sha256-5Ue8PCe4RPA9ImzAuWj2LlxBbRCc0VQBb1AhX4vFB3g=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.82.18",
"rev": "v1.82.20",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1535,11 +1535,11 @@
"vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg="
},
"yandex": {
"hash": "sha256-42LhewtXX8TTRB6Xfz0iQaa1ldKm+YRmLm0s+LKvdic=",
"hash": "sha256-JTQnnJUr6qX1KilrwE1VQi74krq1ci4+iz/8jHaHmXY=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.152.0",
"rev": "v0.156.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LovDyADJeMQpIW3YqrdoNChmRf4XDBZK3DG/oOmtxOI="
}
pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+397 -397
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/remote/teamviewer/default.nix
+3 -3
View File
@@ -30,7 +30,7 @@ mkDerivation rec {
"out"
"dev"
];
version = "15.68.5";
version = "15.69.4";
src =
let
@@ -39,11 +39,11 @@ mkDerivation rec {
{
x86_64-linux = fetchurl {
url = "${base_url}/teamviewer_${version}_amd64.deb";
hash = "sha256-+MTp2ArZTcGFr1YwHIRfBIpjkRm0i9C1Pt5TzDE1SNE=";
hash = "sha256-GNGmqgiu4Vk0X+KndCkEoryFHG/Vv/P2xYdlzUJT1wo=";
};
aarch64-linux = fetchurl {
url = "${base_url}/teamviewer_${version}_arm64.deb";
hash = "sha256-3IVZya1WTGl2AtQ2F9jyX2sDLBa2L2/sfsszhyvzu4A=";
hash = "sha256-M6Q6HIp7TgtqzVduMJM1au0i4/hDUUwdIoe3q36YA/0=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
pkgs/applications/virtualization/virtualbox/default.nix
+12 -19
View File
@@ -72,12 +72,13 @@ let
buildType = "release";
# Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
virtualboxVersion = "7.1.12";
virtualboxVersion = "7.2.0";
virtualboxSubVersion = "";
virtualboxSha256 = "6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276";
virtualboxSha256 = "4f2804ff27848ea772aee6b637bb1e10ee74ec2da117c257413e2d2c4f670ba0";
kvmPatchVersion = "20250207";
kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";
kvmPatchVboxVersion = "7.2.0";
kvmPatchVersion = "20250903";
kvmPatchHash = "sha256-JTE9Kr+nJ6HLeDrzL2EVyDQhxzn3UsoQVIQ6zNCwioY=";
# The KVM build is not compatible to VirtualBox's kernel modules. So don't export
# modsrc at all.
@@ -231,8 +232,8 @@ stdenv.mkDerivation (finalAttrs: {
# No update patch disables check for update function
# https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212
(fetchpatch {
url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/42a1ca1291fde365bfba140cb21a8a074aaccce2/debian/patches/16-no-update.patch";
hash = "sha256-qM2e4DkkpmA18Z76OUsnY1MhcGb1dT2PG68JUy6fZEE=";
url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/8028d88e6876ca5977de13c58b54e243229efe98/debian/patches/16-no-update.patch";
hash = "sha256-AGtFsRjwd8Yw296eqX3NC2TUptAhpFTRaOMutiheQ6Y=";
})
]
++ [ ./extra_symbols.patch ]
@@ -250,23 +251,15 @@ stdenv.mkDerivation (finalAttrs: {
)
# While the KVM patch should not break any other behavior if --with-kvm is not specified,
# we don't take any chances and only apply it if people actually want to use KVM support.
++ optional enableKvm (
let
patchVboxVersion =
# There is no updated patch for 7.1.12 yet, but the older one still applies.
if finalAttrs.virtualboxVersion == "7.1.12" then "7.1.6" else finalAttrs.virtualboxVersion;
in
fetchpatch {
name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";
url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${patchVboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch";
hash = finalAttrs.kvmPatchHash;
}
)
++ optional enableKvm (fetchpatch {
name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";
url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${kvmPatchVboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch";
hash = finalAttrs.kvmPatchHash;
})
++ [
./qt-dependency-paths.patch
# https://github.com/NixOS/nixpkgs/issues/123851
./fix-audio-driver-loading.patch
./fix-graphics-driver-loading.patch
];
postPatch = ''
pkgs/applications/virtualization/virtualbox/extpack.nix
+2 -2
View File
@@ -4,7 +4,7 @@
virtualbox,
}:
let
virtualboxExtPackVersion = "7.1.12";
virtualboxExtPackVersion = "7.2.0";
in
fetchurl rec {
name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@@ -14,7 +14,7 @@ fetchurl rec {
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
let
value = "c7ed97f4755988ecc05ec633475e299bbc1e0418cc3d143747a45c99df53abd3";
value = "8a44f3eeaf9bb71fab297bf4b3d38bd1bc55243f3c1a12bfb0e8d78170f949a0";
in
assert (builtins.stringLength value) == 64;
value;
pkgs/applications/virtualization/virtualbox/fix-graphics-driver-loading.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
index 1a43382..c376d6e 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
@@ -3376,7 +3376,7 @@ static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, P
AssertReturn(pBackend, VERR_NO_MEMORY);
pThisCC->svga.p3dState->pBackend = pBackend;
- rc = RTLdrLoadSystem(VBOX_D3D11_LIBRARY_NAME, /* fNoUnload = */ true, &pBackend->hD3D11);
+ rc = RTLdrLoad(VBOX_D3D11_LIBRARY_NAME, &pBackend->hD3D11);
AssertRC(rc);
if (RT_SUCCESS(rc))
{
pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}:
fetchurl {
url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
sha256 = "256883e2eabf7ab5c10fb3b6831c294942ce34bc615807f9d0cf6c3d2e882236";
sha256 = "43f7a1045cad0aab40e3af906fea37244ba6873b91b4e227245a14e51b399abd";
meta = {
description = "Guest additions ISO for VirtualBox";
longDescription = ''
pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
-3
View File
@@ -78,9 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
rm -r src/libs/zlib*/
'';
# Apply fix for: https://www.virtualbox.org/ticket/22397
patches = lib.optional stdenv.hostPlatform.isAarch64 ./guest-additions-aarch64-fix.patch;
postPatch = ''
set -x
sed -e 's@MKISOFS --version@MKISOFS -version@' \
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+2 -2
View File
@@ -12,9 +12,9 @@
libX11,
}:
let
virtualboxVersion = "7.1.12";
virtualboxVersion = "7.2.0";
virtualboxSubVersion = "";
virtualboxSha256 = "6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276";
virtualboxSha256 = "4f2804ff27848ea772aee6b637bb1e10ee74ec2da117c257413e2d2c4f670ba0";
platform =
if stdenv.hostPlatform.isAarch64 then
pkgs/applications/virtualization/virtualbox/guest-additions/guest-additions-aarch64-fix.patch
-15
View File
@@ -1,15 +0,0 @@
diff --git a/configure b/configure
index e845993..a5b526e 100644q
--- a/configure
+++ b/configure
@@ -422,6 +422,10 @@ check_environment()
BUILD_MACHINE='sparc32'
BUILD_CPU='blend'
;;
+ aarch64)
+ BUILD_MACHINE='arm64'
+ BUILD_CPU='blend'
+ ;;
*)
log_failure "Cannot determine system"
exit 1
pkgs/by-name/_6/_6tunnel/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "6tunnel";
version = "0.13";
version = "0.14";
src = fetchFromGitHub {
owner = "wojtekka";
repo = "6tunnel";
rev = version;
sha256 = "0zsx9d6xz5w8zvrqsm8r625gpbqqhjzvjdzc3z8yix668yg8ff8h";
sha256 = "sha256-ftTAFjHlXRrXH6co8bX0RY092lAmv15svZn4BKGVuq0=";
};
nativeBuildInputs = [ autoreconfHook ];
pkgs/by-name/al/alice-lg/package.nix
+3 -3
View File
@@ -13,16 +13,16 @@
buildGoModule rec {
pname = "alice-lg";
version = "6.1.0";
version = "6.2.0";
src = fetchFromGitHub {
owner = "alice-lg";
repo = "alice-lg";
rev = version;
hash = "sha256-BbwTLHDtpa8HCECIiy+UxyQiLf9iAD2GzE0azXk7QGU=";
hash = "sha256-DlmUurpu/bs/91fLsSQ3xJ8I8NWJweynMgV6Svkf0Uo=";
};
vendorHash = "sha256-8N5E1CW5Z7HujwXRsZLv7y4uNOJkjj155kmX9PCjajQ=";
vendorHash = "sha256-OkOUgW6BHJKIdY1soMqTXhL6RYy3567iL1/VZasIdvQ=";
passthru.ui = stdenv.mkDerivation {
pname = "alice-lg-ui";
pkgs/by-name/av/avbroot/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "avbroot";
version = "3.20.0";
version = "3.22.0";
src = fetchFromGitHub {
owner = "chenxiaolong";
repo = "avbroot";
tag = "v${version}";
hash = "sha256-O5Mmu/b2Sl9UZTNHnDkqu6nWF79m480n03vJ7Ve3khQ=";
hash = "sha256-Ijyw6fUf5jW5di7gvnV0Eh1kG4q/x8GbG4R0q74rWLs=";
};
cargoHash = "sha256-K7xnk0SR6x0VrGFxWQC6B+KxhNpbfvlkRhJ4oALkXco=";
cargoHash = "sha256-eYnKxMwdk4nlDFvzoMoWSH4NO753IY68dN/Ok0BZf0Q=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/aw/aws-sso-cli/package.nix
+3 -3
View File
@@ -10,15 +10,15 @@
}:
buildGoModule rec {
pname = "aws-sso-cli";
version = "2.0.3";
version = "2.1.0";
src = fetchFromGitHub {
owner = "synfinatic";
repo = "aws-sso-cli";
rev = "v${version}";
hash = "sha256-GoLSdQb6snViYD9QY6NTypKquFsoX3jgClyrgTGoRq8=";
hash = "sha256-MomH4Zcc6iyVmLfA0PPsWgEqMBAAaPd+21NX4GdnFk0=";
};
vendorHash = "sha256-SNMU7qDfLRGUSLjzrJHtIMgbcRc2DxXwWEUaUEY6PME=";
vendorHash = "sha256-Le5BOD/iBIMQwTNmb7JcW8xJS7WG5isf4HXpJxyvez0=";
nativeBuildInputs = [
makeWrapper
pkgs/by-name/bi/biscuit-cli/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "biscuit-cli";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "biscuit-auth";
repo = "biscuit-cli";
rev = version;
sha256 = "sha256-BLDJ4Rzu48sAklbv021XSzmATRd+D01yGHqJt6kvjGw=";
sha256 = "sha256-s4Y4MhM79Z+4VxB03+56OqRQJaSHj2VQEJcL6CsT+2k=";
};
cargoHash = "sha256-3rDsgEH6tTEnAc/+8Try/z3mMBOguOTbxfXs5QIMBf4=";
cargoHash = "sha256-OG8/9CxOTCYXwyavdaXvak8GbCOMvelcsSJVkEgdMdI=";
passthru = {
updateScript = nix-update-script { };
pkgs/by-name/bi/bitwarden-desktop/package.nix
+3 -3
View File
@@ -34,13 +34,13 @@ let
in
buildNpmPackage' rec {
pname = "bitwarden-desktop";
version = "2025.8.1";
version = "2025.8.2";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-8meYZIJQFD2CAfB8DwFrcqkMx2lj2ZRZ7Vsaen+fXb4=";
hash = "sha256-cYSzAdrUvZrYPQ01uPJ6I1yJvTQtdV2rV0GTF6yKVCk=";
};
patches = [
@@ -87,7 +87,7 @@ buildNpmPackage' rec {
"--ignore-scripts"
];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-LMUbwrJNW1f9PaxZIY/1QEextfHUizaTcEdPLRUFihM=";
npmDepsHash = "sha256-1SDXXsfyJDMjg4v0i9jDh7Y7m6LXd0vW4g0vRLeDXD8=";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit
pkgs/by-name/cl/clapboard/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "clapboard";
version = "1.0.3";
version = "1.1.0";
src = fetchFromGitHub {
owner = "bjesus";
repo = "clapboard";
rev = "v${version}";
hash = "sha256-TM07BcluIh+MEcVg1ApZu85rj36ZBUfn125A0eALNMo=";
hash = "sha256-1y2tG4ajnsstNkPTE3eBr8QJJF6Qq/HCQzJoj1ETuUY=";
};
cargoHash = "sha256-uPMaw36y9773LTu02muLot8I42VM2GE/MJSAHClLNgs=";
cargoHash = "sha256-DEwipAG/zPPftYwYahRJfpXgHPXerGdn10PkS8DHWCM=";
meta = with lib; {
description = "Wayland clipboard manager that will make you clap";
pkgs/by-name/cl/claude-code/package-lock.json
Generated
+4 -4
View File
@@ -6,13 +6,13 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^1.0.102"
"@anthropic-ai/claude-code": "^1.0.105"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "1.0.102",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.102.tgz",
"integrity": "sha512-UIC6qNgKNZi1nLTf1bQvxNfd74xIAqJjIx6vggh3bJOMtuXBiFwrfPk1Pdf9CayYgwZYXgSmxYYaASt6i6ficQ==",
"version": "1.0.105",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.105.tgz",
"integrity": "sha512-tYyWmdCmbbE7hbr1v4FZq6zwU5joJATijcjsVFh77HnUHp1L7svraIhRr0o+cI0PNyQR3eCt9KGxgCh3aFM4sg==",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
pkgs/by-name/cl/claude-code/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "claude-code";
version = "1.0.102";
version = "1.0.105";
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-l7KiRp+V/eFVV6n1pv7tZv/VjXXWGPJnIcnicO5DGfA=";
hash = "sha256-9beqR/jIBazW6y9yw1cgJOESrrSmbKdRLyH5Vg2Uss8=";
};
npmDepsHash = "sha256-iiimBp5GrSeabpN0nsp6vxFom7r4wNbWxiREfLeYs9w=";
npmDepsHash = "sha256-I+B9mTj/+jfH4tAgxcSQ2zy920brobKnLubfDZ2GCIE=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
pkgs/by-name/cl/cling/fix-new-parser.patch
+54
View File
@@ -0,0 +1,54 @@
From cd4d1d8c4963620a6a84834948845df81fbbd70b Mon Sep 17 00:00:00 2001
From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
Date: Tue, 17 Dec 2024 14:54:18 +0100
Subject: [PATCH] Use single Parser for LookupHelper
It is the only construction of a temporary parser, and it seems not
necessary (anymore).
---
include/cling/Interpreter/LookupHelper.h | 2 +-
lib/Interpreter/Interpreter.cpp | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/include/cling/Interpreter/LookupHelper.h b/include/cling/Interpreter/LookupHelper.h
index 6e6e281470..cd79b2a65c 100644
--- a/include/cling/Interpreter/LookupHelper.h
+++ b/include/cling/Interpreter/LookupHelper.h
@@ -56,7 +56,7 @@ namespace cling {
WithDiagnostics
};
private:
- std::unique_ptr<clang::Parser> m_Parser;
+ clang::Parser* m_Parser;
Interpreter* m_Interpreter; // we do not own.
std::array<const clang::Type*, kNumCachedStrings> m_StringTy = {{}};
/// A map containing the hash of the lookup buffer. This allows us to avoid
diff --git a/lib/Interpreter/Interpreter.cpp b/lib/Interpreter/Interpreter.cpp
index 13c8409cc5..f04695439b 100644
--- a/lib/Interpreter/Interpreter.cpp
+++ b/lib/Interpreter/Interpreter.cpp
@@ -265,13 +265,6 @@ namespace cling {
}
Sema& SemaRef = getSema();
- Preprocessor& PP = SemaRef.getPreprocessor();
-
- m_LookupHelper.reset(new LookupHelper(new Parser(PP, SemaRef,
- /*SkipFunctionBodies*/false,
- /*isTemp*/true), this));
- if (!m_LookupHelper)
- return;
if (!isInSyntaxOnlyMode() && !m_Opts.CompilerOpts.CUDADevice) {
m_Executor.reset(new IncrementalExecutor(SemaRef.Diags, *getCI(),
@@ -317,6 +310,10 @@ namespace cling {
return;
}
+ m_LookupHelper.reset(new LookupHelper(m_IncrParser->getParser(), this));
+ if (!m_LookupHelper)
+ return;
+
// When not using C++ modules, we now have a PCH and we can safely setup
// our callbacks without fearing that they get overwritten by clang code.
// The modules setup is handled above.
pkgs/by-name/cl/cling/no-clang-cpp.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 590d708d83..340ae529d4 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
add_dependencies(clang clang-resource-headers)
if(NOT CLANG_LINKS_TO_CREATE)
- set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp)
+ set(CLANG_LINKS_TO_CREATE clang++ clang-cl)
endif()
foreach(link ${CLANG_LINKS_TO_CREATE})
pkgs/by-name/cl/cling/package.nix
+40 -48
View File
@@ -5,13 +5,13 @@
git,
lib,
libffi,
llvmPackages_13,
llvmPackages_18,
makeWrapper,
ncurses,
python3,
zlib,
# *NOT* from LLVM 13!
# *NOT* from LLVM 18!
# The compiler used to compile Cling may affect the runtime include and lib
# directories it expects to be run with. Cling builds against (a fork of) Clang,
# so we prefer to use Clang as the compiler as well for consistency.
@@ -34,42 +34,39 @@
let
stdenv = clangStdenv;
# The patched clang lives in the LLVM megarepo
clangSrc = fetchFromGitHub {
version = "1.2";
clingSrc = fetchFromGitHub {
owner = "root-project";
repo = "llvm-project";
# cling-llvm13 branch
rev = "3610201fbe0352a63efb5cb45f4ea4987702c735";
sha256 = "sha256-Cb7BvV7yobG+mkaYe7zD2KcnPvm8/vmVATNWssklXyk=";
sparseCheckout = [ "clang" ];
repo = "cling";
rev = "v${version}";
sha256 = "sha256-ay9FXANJmB/+AdnCR4WOKHuPm6P88wLqoOgiKJwJ8JM=";
};
llvm = llvmPackages_13.llvm.override { enableSharedLibraries = false; };
unwrapped = stdenv.mkDerivation rec {
unwrapped = stdenv.mkDerivation {
pname = "cling-unwrapped";
version = "1.0";
inherit version;
src = "${clangSrc}/clang";
clingSrc = fetchFromGitHub {
src = fetchFromGitHub {
owner = "root-project";
repo = "cling";
rev = "v${version}";
sha256 = "sha256-Ye8EINzt+dyNvUIRydACXzb/xEPLm0YSkz08Xxw3xp4=";
repo = "llvm-project";
rev = "cling-llvm18-20250721-01";
sha256 = "sha256-JGteapyujU5w81DsfPQfTq76cYHgk5PbAFbdYfYIDo4=";
};
prePatch = ''
echo "add_llvm_external_project(cling)" >> tools/CMakeLists.txt
preConfigure = ''
cp -r ${clingSrc} cling-source
cp -r $clingSrc tools/cling
chmod -R a+w tools/cling
# Patch a bug in version 1.2 by backporting a fix. See
# https://github.com/root-project/cling/issues/556
chmod -R u+w cling-source
pushd cling-source
patch -p1 < ${./fix-new-parser.patch}
popd
cd llvm
'';
patches = [
./no-clang-cpp.patch
];
nativeBuildInputs = [
python3
git
@@ -84,22 +81,15 @@ let
strictDeps = true;
cmakeFlags = [
"-DLLVM_BINARY_DIR=${llvm.out}"
"-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
"-DLLVM_LIBRARY_DIR=${llvm.lib}/lib"
"-DLLVM_MAIN_INCLUDE_DIR=${llvm.dev}/include"
"-DLLVM_TABLEGEN_EXE=${llvm.out}/bin/llvm-tblgen"
"-DLLVM_TOOLS_BINARY_DIR=${llvm.out}/bin"
"-DLLVM_BUILD_TOOLS=Off"
"-DLLVM_TOOL_CLING_BUILD=ON"
"-DLLVM_EXTERNAL_PROJECTS=cling"
"-DLLVM_EXTERNAL_CLING_SOURCE_DIR=../../cling-source"
"-DLLVM_ENABLE_PROJECTS=clang"
"-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
"-DLLVM_INCLUDE_TESTS=OFF"
"-DLLVM_ENABLE_RTTI=ON"
# Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built;
# see cling/tools/CMakeLists.txt
"-DCLING_INCLUDE_TESTS=ON"
"-DCLANG-TOOLS=OFF"
]
++ lib.optionals (!debug) [
"-DCMAKE_BUILD_TYPE=Release"
]
++ lib.optionals debug [
"-DCMAKE_BUILD_TYPE=Debug"
@@ -111,11 +101,13 @@ let
CPPFLAGS = if useLLVMLibcxx then [ "-stdlib=libc++" ] else [ ];
postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
postInstall = ''
mkdir -p $out/share/Jupyter
cp -r /build/clang/tools/cling/tools/Jupyter/kernel $out/share/Jupyter
cp -r ../../cling-source/tools/Jupyter/kernel $out/share/Jupyter
'';
buildTargets = [ "cling" ];
dontStrip = debug;
meta = with lib; {
@@ -147,18 +139,18 @@ let
"-nostdinc++"
"-resource-dir"
"${llvm.lib}/lib"
"${llvmPackages_18.llvm.lib}/lib"
"-isystem"
"${lib.getLib unwrapped}/lib/clang/${llvmPackages_13.clang.version}/include"
"${lib.getLib unwrapped}/lib/clang/18/include"
]
++ lib.optionals useLLVMLibcxx [
"-I"
"${lib.getDev llvmPackages_13.libcxx}/include/c++/v1"
"${lib.getDev llvmPackages_18.libcxx}/include/c++/v1"
"-L"
"${llvmPackages_13.libcxx}/lib"
"${llvmPackages_18.libcxx}/lib"
"-l"
"${llvmPackages_13.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}"
"${llvmPackages_18.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}"
]
++ lib.optionals (!useLLVMLibcxx) [
"-I"
pkgs/by-name/cl/clive/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
}:
buildGoModule rec {
pname = "clive";
version = "0.12.11";
version = "0.12.12";
src = fetchFromGitHub {
owner = "koki-develop";
repo = "clive";
tag = "v${version}";
hash = "sha256-BAKZTWcC8EzDTlQZUJBzVQNF0kDBY7Lx+8ZFAYgoWlQ=";
hash = "sha256-gycxHlNbwPLpR/ATxAsQ68Fetp/hptOUsRc+D3P7x1k=";
};
vendorHash = "sha256-ljjSopfKGSotJx52SScl7KwFyKbFF9uxQMODjuZH4vc=";
vendorHash = "sha256-S2MR3eDfAiEz7boUetdPmOf0rQe7QrV6yO1RfMAEj4o=";
subPackages = [ "." ];
buildInputs = [ ttyd ];
nativeBuildInputs = [
pkgs/applications/science/chemistry/cp2k/default.nix → pkgs/by-name/cp/cp2k/package.nix
+75 -6
View File
@@ -39,6 +39,12 @@
elpa,
cudaPackages,
rocmPackages,
newScope,
mctc-lib,
jonquil,
multicharge,
mstore,
test-drive,
config,
gpuBackend ? (
if config.cudaSupport then
@@ -60,6 +66,69 @@ assert builtins.elem gpuBackend [
"rocm"
];
let
grimmeCmake = lib.makeScope newScope (self: {
mctc-lib = mctc-lib.override {
buildType = "cmake";
inherit (self) jonquil toml-f;
};
toml-f = toml-f.override {
buildType = "cmake";
inherit (self) test-drive;
};
dftd4 = dftd4.override {
buildType = "cmake";
inherit (self) mstore mctc-lib multicharge;
};
jonquil = jonquil.override {
buildType = "cmake";
inherit (self) toml-f test-drive;
};
mstore = mstore.override {
buildType = "cmake";
inherit (self) mctc-lib;
};
multicharge = multicharge.override {
buildType = "cmake";
inherit (self) mctc-lib mstore;
};
test-drive = test-drive.override { buildType = "cmake"; };
simple-dftd3 = simple-dftd3.override {
buildType = "cmake";
inherit (self) mctc-lib mstore toml-f;
};
tblite = tblite.override {
buildType = "cmake";
inherit (self)
mctc-lib
mstore
toml-f
multicharge
dftd4
simple-dftd3
;
};
sirius = sirius.override {
inherit (self)
mctc-lib
toml-f
multicharge
dftd4
simple-dftd3
;
};
});
in
stdenv.mkDerivation rec {
pname = "cp2k";
version = "2025.2";
@@ -87,19 +156,16 @@ stdenv.mkDerivation rec {
which
makeWrapper
pkg-config
gfortran
]
++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
buildInputs = [
gfortran
fftw
gsl
libint
libvori
libxc
dftd4
simple-dftd3
tblite
libxsmm
mpi
spglib
@@ -110,14 +176,17 @@ stdenv.mkDerivation rec {
plumed
zlib
hdf5-fortran
sirius
spla
spfft
libvdwxc
trexio
toml-f
greenx
gmp
grimmeCmake.dftd4
grimmeCmake.simple-dftd3
grimmeCmake.tblite
grimmeCmake.sirius
grimmeCmake.toml-f
]
++ lib.optional enableElpa elpa
++ lib.optionals (gpuBackend == "cuda") [
pkgs/applications/science/chemistry/cp2k/pkgconfig.patch → pkgs/by-name/cp/cp2k/pkgconfig.patch
View File
pkgs/applications/science/chemistry/cp2k/remove-compiler-options.patch → pkgs/by-name/cp/cp2k/remove-compiler-options.patch
View File
pkgs/by-name/cp/cpu-x/package.nix
+2 -2
View File
@@ -39,13 +39,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cpu-x";
version = "5.3.1";
version = "5.4.0";
src = fetchFromGitHub {
owner = "TheTumultuousUnicornOfDarkness";
repo = "CPU-X";
tag = "v${finalAttrs.version}";
hash = "sha256-yrDTvOdMeUw2fxLtNjCZggs9M9P1YKeMxm/dI5MRyYQ=";
hash = "sha256-db7NxoVZgnYb1MZKfiFINx00JqDnf/TvwumBp6qDooQ=";
};
nativeBuildInputs = [
pkgs/by-name/da/davis/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "davis";
version = "5.1.2";
version = "5.1.3";
src = fetchFromGitHub {
owner = "tchapi";
repo = "davis";
tag = "v${finalAttrs.version}";
hash = "sha256-Z2e5QRyyJeisWLi2tZJZNAXrO3/DL6v2Nvxd0+SC6EU=";
hash = "sha256-2gM6G1ZqHOUNmFjo3icHdV7xX/kbi0MO98GDzsBTGGo=";
};
vendorHash = "sha256-ee3Gvg8rvX9jelmSVHjFltZz9R+7w2B8L4gjv3GaN/g=";
vendorHash = "sha256-RNvFviWu1ZNPWguzL9MbOsWctKfPeJGWZJ8Y2HDEXkI=";
composerNoPlugins = false;
pkgs/by-name/de/deadnix/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "deadnix";
version = "1.2.1";
version = "1.3.1";
src = fetchFromGitHub {
owner = "astro";
repo = "deadnix";
rev = "v${version}";
hash = "sha256-xaaXGzTd+t1GjD2KpiS/c8acv6bXufv/lTN+ACRGVJw=";
hash = "sha256-WrzIqt28RhoFYhCMu5oY5jAdGh0Gv5uryW/1jTX99aY=";
};
cargoHash = "sha256-unp5W2vatSS58O+nEAVsVBN99hgYRVc1OkD2vVandw0=";
cargoHash = "sha256-IgGuWIsDsiMqscO4B876iTCdrR+nI9bpTQOyxjCtjMk=";
meta = with lib; {
description = "Find and remove unused code in .nix source files";
pkgs/by-name/dn/dnscrypt-proxy/package.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildGoModule rec {
pname = "dnscrypt-proxy";
version = "2.1.13";
version = "2.1.14";
vendorHash = null;
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "DNSCrypt";
repo = "dnscrypt-proxy";
rev = version;
hash = "sha256-IFfhcirUGbp/pKFN/5aEpuIuhSR3ZS4K7TatBtaX5zg=";
hash = "sha256-JPBAlRpJw6Oy4f3twyhX95XqWFtUTEFPjwyVaNMSHmQ=";
};
passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; };
pkgs/by-name/du/dufs/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "dufs";
version = "0.44.0";
version = "0.45.0";
src = fetchFromGitHub {
owner = "sigoden";
repo = "dufs";
rev = "v${version}";
hash = "sha256-krrph0tyz7d1cSmScKSAVSYoKp9RbsZvVdOLIvbJ3dc=";
hash = "sha256-83lFnT4eRYaBe4e2o6l6AGQycm/oK96n5DXutBNvBsE=";
};
cargoHash = "sha256-cklssERy3sDYWCyzgQd7tsRd+kuBmSTZBio8svMQP2Q=";
cargoHash = "sha256-WdjqG2URtloh5OnpBBnEWHD3WKGkCKLDcCyWRVGIXto=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
+2 -2
View File
@@ -10,14 +10,14 @@ Signed-off-by: Luke Granger-Brown <git@lukegb.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
index 4615eed5c9ade5279f8174cf1bd3987a8b2d52f1..10be4b0b3f65e486c1dc8419337a5cf823431774 100644
index ecfe356b3f9c44dbc00877e57b72a675e9e5baf0..10be4b0b3f65e486c1dc8419337a5cf823431774 100644
--- a/bazel/dependency_imports.bzl
+++ b/bazel/dependency_imports.bzl
@@ -24,7 +24,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set")
# go version for rules_go
-GO_VERSION = "1.23.1"
-GO_VERSION = "1.24.6"
+GO_VERSION = "host"
JQ_VERSION = "1.7"
pkgs/by-name/en/envoy/package.nix
+5 -5
View File
@@ -39,9 +39,9 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
version = "1.35.1";
rev = "6e9539d0366baf85baf9acb3e618cb3384765f13";
hash = "sha256-c1c8j/BCRrvAEqjt4EQ/d7zsM1zUe4Qr5EHzpuGblIk=";
version = "1.35.2";
rev = "2c2cd7efd119a5c9028b68a97d88a540248f8d18";
hash = "sha256-HhjIewZMOr9hzcnFPIckfK5PIozqdypSdmYgvb7ccds=";
};
# these need to be updated for any changes to fetchAttrs
@@ -50,8 +50,8 @@ let
depsHash
else
{
x86_64-linux = "sha256-t4Xv4UGYW5YU0kmv+1rdf2JvM1BYQyNWdtpz6Cdmxm4=";
aarch64-linux = "sha256-aIBnNGzc0hTdlTgRyJ7eLnWvHqZ5ywhqOM+mHfH3/18=";
x86_64-linux = "sha256-pih2EaVFDSTaCDpqkVSt39wBFGc4MFrhc1BioeHBp+w=";
aarch64-linux = "sha256-RpgZSsDJctTzqm8M3u0+jyEi51HaNC2RZH0Hrelovo8=";
}
.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
pkgs/by-name/fa/fastfetch/package.nix
+2 -2
View File
@@ -59,13 +59,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.51.0";
version = "2.51.1";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
tag = finalAttrs.version;
hash = "sha256-YEKnOvcW4/Syl/iAo8JG63Qw7qEeTpiEp+Oq+O5kFZQ=";
hash = "sha256-RWQuW2XJpbQLFCzuHSJyYdv2RSAAOtlm/xbVd18Nv7A=";
};
outputs = [
pkgs/by-name/gl/glasskube/package.nix
+4 -4
View File
@@ -9,12 +9,12 @@
}:
let
version = "0.25.0";
version = "0.26.1";
gitSrc = fetchFromGitHub {
owner = "glasskube";
repo = "glasskube";
tag = "v${version}";
hash = "sha256-456kMO7KappYI2FuHA8g+uhkJNCGCxb/9zmleZqu6SQ=";
hash = "sha256-M/7qfr4gpogx7cr7zh/MARZME3/4ePjVUVcjG85Ona0=";
};
web-bundle = buildNpmPackage {
inherit version;
@@ -22,7 +22,7 @@ let
src = gitSrc;
npmDepsHash = "sha256-XKPFT8eyZmDhNbuCpTzGYeg5QdhgpVhHkj8AGSlh6WU=";
npmDepsHash = "sha256-1+ROYamu0FHed6x2Y+88P0ntR8aJdN1d2UBqMBfpmyw=";
dontNpmInstall = true;
@@ -43,7 +43,7 @@ buildGoModule rec {
src = gitSrc;
vendorHash = "sha256-oly6SLgXVyvKQQuPrb76LYngoDPNLjTAs4gWCT3/kew=";
vendorHash = "sha256-0cTW01f9yputdqLvpfISaS50Jeolh12OTP+NjsgXncA=";
env.CGO_ENABLED = 0;
pkgs/by-name/go/gogup/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "gogup";
version = "0.27.8";
version = "0.27.9";
src = fetchFromGitHub {
owner = "nao1215";
repo = "gup";
rev = "v${version}";
hash = "sha256-5ZeiW8WPpfQfLe02lXRIOvQ9T9yslmYuYLt7ftqHfqc=";
hash = "sha256-8pBJcTv3f5ovbtuXuGVmF8m/6CQd19zpoJDs7PtsGcs=";
};
vendorHash = "sha256-ceUvLf/kBM/542fia9A6xTFNge8y1QFxBVw2RNODkN8=";
vendorHash = "sha256-sLf0Yhc495rOi0/Ww2/1BD5WXGTFyf6SzfTV9TtGzZk=";
doCheck = false;
ldflags = [
pkgs/by-name/go/google-lighthouse/package.nix
+3 -3
View File
@@ -12,18 +12,18 @@
}:
stdenv.mkDerivation rec {
pname = "google-lighthouse";
version = "12.8.1";
version = "12.8.2";
src = fetchFromGitHub {
owner = "GoogleChrome";
repo = "lighthouse";
tag = "v${version}";
hash = "sha256-7I2dtQIWbhkH4l3seDA76bkZWTT+izWASTQXsMb3d+Y=";
hash = "sha256-pluMFOyW352tEWjz28jhI4AZcKDB5jhoWIzTWyLxwGY=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-wmzQE9gmjynHfS47fg/yDizf3/JAOfd+xeAh0XRIat8=";
hash = "sha256-yQT2JUsu/3ttJU8zUdtlhzUscepISNUr3wlxKHLaz3I=";
};
yarnBuildScript = "build-report";
pkgs/by-name/hi/hii/package.nix
+43
View File
@@ -0,0 +1,43 @@
{
stdenv,
lib,
fetchFromGitHub,
buildGoModule,
installShellFiles,
}:
buildGoModule {
pname = "hii";
version = "1.1.5-unstable-2025-08-03";
src = fetchFromGitHub {
owner = "nmeum";
repo = "hii";
rev = "6c07f4955a85eb32fcc0589238d5a00c1a8722f2";
sha256 = "sha256-CXpN57T+o5MPoUxwL48GfEedz05TK8+jPFgdSIdqk+8=";
};
vendorHash = "sha256-lN/ESmpS8K0eC21F5RUbMN35I9b4uBE86CgAnhF1+VA=";
outputs = [
"out"
"man"
"doc"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage hii.1 hii.5
install -Dm644 README.md $doc/share/doc/hii/README.md
'';
meta = {
homepage = "https://github.com/nmeum/hii/";
license = lib.licenses.gpl3Only;
description = "A file-based IRC client inspired by ii";
mainProgram = "hii";
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.sternenseemann ];
};
}
pkgs/by-name/ht/httptoolkit-server/package.nix
+3 -3
View File
@@ -16,13 +16,13 @@ let
nodejs = nodejs_20;
buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
version = "1.22.0";
version = "1.22.1";
src = fetchFromGitHub {
owner = "httptoolkit";
repo = "httptoolkit-server";
tag = "v${version}";
hash = "sha256-4kvpTqajlBWIYveedmlo2yrnbEdN/V+96/Lf54miMuw=";
hash = "sha256-6mvbR9WIjVrulDdFtW0XSfxPwKSaFK1fFIhbglS7Gq4=";
};
overridesNodeModules = buildNpmPackage' {
@@ -102,7 +102,7 @@ buildNpmPackage' {
patches = [ ./only-build-for-one-platform.patch ];
npmDepsHash = "sha256-J6QmJsnl5UCxeSKIcekdguM+M5Z2HBYRat5nt18zPYU=";
npmDepsHash = "sha256-z9LLZBt7CR3iCNsGhRboHgaaoH6MgmSrzasgwIX+iwk=";
npmFlags = [ "--ignore-scripts" ];
pkgs/by-name/is/istioctl/package.nix
+3 -3
View File
@@ -7,15 +7,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.27.0";
version = "1.27.1";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
hash = "sha256-Rehzwr/6S1c3kzqyJIIvLO3jDTSSrkyb2HHcUn9Tco8=";
hash = "sha256-APUhW1PoNmfnbScoeVbsFY1R9jJT4wABpOjxtY5fFVc=";
};
vendorHash = "sha256-AAWGfNRAgR/Vr3VDMphOPah8a02czsf8fpWi2aeG1Jo=";
vendorHash = "sha256-+dlZAO6odRCbsqm5Q172g4OMs9S4ovekajAoseHYZ94=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ju/jujutsu/package.nix
+3 -9
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jujutsu";
version = "0.32.0";
version = "0.33.0";
src = fetchFromGitHub {
owner = "jj-vcs";
repo = "jj";
tag = "v${finalAttrs.version}";
hash = "sha256-TFKUz8hUCRM9RPkp9CBvKnd4e+TnR8H5t9/N76cAKzI=";
hash = "sha256-EKYM18UavIbZeI5/F5OKUzyjQip0yb6WPt6BZ2YpYww=";
};
cargoHash = "sha256-QWbAXqOysIZ7vUeBqAL/iP2QJBHgkZwjsUIregPNezg=";
cargoHash = "sha256-iIMmtuf4uDe2PX/X3UW8sDt3kPTij8Nlh/SU92abvUw=";
nativeBuildInputs = [
installShellFiles
@@ -51,12 +51,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
"jj-cli"
];
# taplo-cli (used in tests) always creates a reqwest client, which
# requires configd access on macOS.
sandboxProfile = ''
(allow mach-lookup (global-name "com.apple.SystemConfiguration.configd"))
'';
env = {
# Disable vendored libraries.
ZSTD_SYS_USE_PKG_CONFIG = "1";
pkgs/by-name/jx/jx/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "jx";
version = "3.16.20";
version = "3.16.24";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
sha256 = "sha256-FMdT01sooWFn9zWEkn2c9CR85/AsUwILH1asyXcltcM=";
sha256 = "sha256-0BV8wV5kL7WP6cy881D0Rpw0RPIDcI4/LQckrwk/RiQ=";
};
vendorHash = "sha256-qCcwCsinzkjN+g7wxn60JoFBGk6Swydi93w3dZNpsZY=";
vendorHash = "sha256-YUFpTL4BXm1iZJAQcbJSXEUKT99IulxT6qz4mrbBDN0=";
subPackages = [ "cmd" ];
pkgs/by-name/ku/kubeone/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "kubeone";
version = "1.11.1";
version = "1.11.2";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
hash = "sha256-K3Xo2tvtmkGbXl2yJjd8Q1xzdLSap8p824ommi+r8dY=";
hash = "sha256-TDT7qAwd9wewnfICEX+ZI4z9jma0L+SZcZJeQOuv9dc=";
};
vendorHash = "sha256-Wnnwp1GRlE1q8MSc23pOmSn9fKu5uHVzkivfuF2lnEk=";
pkgs/by-name/lu/lug-helper/package.nix
+2 -2
View File
@@ -15,12 +15,12 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
name = "lug-helper";
version = "4.2";
version = "4.4";
src = fetchFromGitHub {
owner = "starcitizen-lug";
repo = "lug-helper";
tag = "v${finalAttrs.version}";
hash = "sha256-W8GwDXYHfGdruAMdBei53V5UPYE6yks0+FW48pARknY=";
hash = "sha256-wYNYgwcves9nmUccDQPGekVt3BIB4QE/t6l9vUwXYUs=";
};
buildInputs = [
pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "matrix-alertmanager-receiver";
version = "2025.8.27";
version = "2025.9.3";
src = fetchFromGitHub {
owner = "metio";
repo = "matrix-alertmanager-receiver";
tag = finalAttrs.version;
hash = "sha256-bJdJJM2Ok1fxMTM2JoZe0mBz3EB0py5ZQfk/7FqfCI0=";
hash = "sha256-RCWQNUZ8ZsGzsjTyqyr2O814qqV6eTumvLU6tvwi7vU=";
};
vendorHash = "sha256-efnLovSd9oC5MO1DTs30GBNDY+r2Q1uD8dCdRqnVhCY=";
vendorHash = "sha256-xkRL0Cq7vXG3dQeyw0IK74xwRiyC89hvB/2BEGQHCN0=";
env.CGO_ENABLED = "0";
pkgs/by-name/mc/mcp-grafana/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "mcp-grafana";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "grafana";
repo = "mcp-grafana";
tag = "v${finalAttrs.version}";
hash = "sha256-6Sfj0v0mYg7j0C0H3ntX8+ydRslOW9b3xzFo3Ti3a5g=";
hash = "sha256-bku8vbNjIggaVzhTXZYBgT7TcI9tAUUUrCjl+cSN9OU=";
};
vendorHash = "sha256-zevHaGR0Lipyn9KzdEQOHC0yqMmSl0/Wp02GTI3MmSw=";
vendorHash = "sha256-42UHI5Z5bgnW40DsRPzoKQdZQ+k785K60gWMp5ehLfU=";
ldflags = [
"-s"
pkgs/by-name/mo/monophony/package.nix
+4 -1
View File
@@ -52,7 +52,10 @@ python3Packages.buildPythonApplication rec {
gstreamer
]);
pythonRelaxDeps = [ "mpris_server" ];
pythonRelaxDeps = [
"mpris_server"
"ytmusicapi"
];
postInstall = ''
make install prefix=$out
pkgs/by-name/n8/n8n/package.nix
+3 -3
View File
@@ -17,19 +17,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "n8n";
version = "1.107.4";
version = "1.109.2";
src = fetchFromGitHub {
owner = "n8n-io";
repo = "n8n";
tag = "n8n@${finalAttrs.version}";
hash = "sha256-CbqxWRIw9NvKJKO/YEmnfYzZ03B6xXqr/J1qkZgpTtE=";
hash = "sha256-A5zrUZnKFb0FokG2Yy8jyb9nldOAEh4PZIEESMSqGco=";
};
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-smSj/4E4Ix0kvWhuRTvJkFbhZRgDI55//WScOLU7R/8=";
hash = "sha256-7GQmAnIuHAQyoAcU55LdMiF78tHWM3lXCqH8VyIvwLM=";
};
nativeBuildInputs = [
pkgs/by-name/na/nautilus-open-any-terminal/package.nix
+2 -2
View File
@@ -16,14 +16,14 @@
python3.pkgs.buildPythonPackage rec {
pname = "nautilus-open-any-terminal";
version = "0.6.1";
version = "0.6.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Stunkymonkey";
repo = "nautilus-open-any-terminal";
tag = version;
hash = "sha256-oiyXDeunAgs3uCrqHKdTcOvXD4vmx8Z3uFutNYpGxtc=";
hash = "sha256-wL2PyEbJ94O9PY8jDBLXk0QvNpuO7Pg8yyblFBwSENA=";
};
patches = [ ./hardcode-gsettings.patch ];
pkgs/by-name/na/navicat-premium/package.nix
+5 -5
View File
@@ -6,17 +6,17 @@
}:
let
pname = "navicat-premium";
version = "17.3.0";
version = "17.3.1";
src =
{
x86_64-linux = fetchurl {
url = "https://web.archive.org/web/20250725013746/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
hash = "sha256-IXUVu7kbFsoWpd21cJb/5Ho03LiaZ2pJ9KlckJ1xcOQ=";
url = "https://web.archive.org/web/20250904095427/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
hash = "sha256-5vGctpbAg3mVhalr+Yg3iFZNCyY+0+a98sldhUcHkm0=";
};
aarch64-linux = fetchurl {
url = "https://web.archive.org/web/20250725014645/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
hash = "sha256-3765am3eJRjTJ9TVo0LYis0tnFEd0anSd6CUl8bfIFU=";
url = "https://web.archive.org/web/20250904095643/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
hash = "sha256-r31u/b/3HO9PEQtIr9AZ/5NVrRcgJ+GACHPWCICZYec=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
pkgs/by-name/ne/nezha/package.nix
+2 -2
View File
@@ -14,7 +14,7 @@
let
pname = "nezha";
version = "1.13.1";
version = "1.13.2";
frontendName = lib.removePrefix "nezha-theme-";
@@ -58,7 +58,7 @@ buildGo124Module {
owner = "nezhahq";
repo = "nezha";
tag = "v${version}";
hash = "sha256-BVaGlkr7lJTVewLkRoyl7JOZ4mwRaRs5JCSSFWO21Dk=";
hash = "sha256-IkB2V4KKSUfX+E9bMEGzCc3urAjgpXYhpO0Lfi4LYdY=";
};
proxyVendor = true;
pkgs/by-name/nn/nnd/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nnd";
version = "0.38";
version = "0.45";
src = fetchFromGitHub {
owner = "al13n321";
repo = "nnd";
tag = "v${finalAttrs.version}";
hash = "sha256-qs+xpsNC9An4sMoF07tPxLW35qvC0BVsK+EYsIgxAa0=";
hash = "sha256-SiGy/Kzb47bRo9HenXb+bBUFzWRMkWAyuIAiGZhbI1A=";
};
cargoHash = "sha256-Iwipxy0xKDyFLMmdB2FQve6DULX+46Pi9rOaK0bDTB0=";
cargoHash = "sha256-bSWgJZR6H8IUH2ZIjj6G3H7jCAdaAghu3jtd3dbh/7M=";
meta = {
description = "Debugger for Linux";
pkgs/by-name/op/opencascade-occt/package.nix
+26 -4
View File
@@ -13,8 +13,12 @@
libXext,
libXmu,
libXi,
}:
vtk,
withVtk ? false,
# used in passthru.tests
opencascade-occt,
}:
stdenv.mkDerivation rec {
pname = "opencascade-occt";
version = "7.8.1";
@@ -33,6 +37,10 @@ stdenv.mkDerivation rec {
url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.diff";
hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
})
# patch does not apply against 7.9+, it was submitted upstream for future
# inclusion: https://github.com/Open-Cascade-SAS/OCCT/pull/683
./vtk-draw-conditional-glx.patch
];
nativeBuildInputs = [
@@ -49,10 +57,25 @@ stdenv.mkDerivation rec {
libXmu
libXi
rapidjson
];
]
++ lib.optional withVtk vtk;
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
cmakeFlags = [ "-DUSE_RAPIDJSON=ON" ];
cmakeFlags = [
(lib.cmakeBool "USE_RAPIDJSON" true)
# Enable exception handling for release builds.
(lib.cmakeBool "BUILD_RELEASE_DISABLE_EXCEPTIONS" false)
]
++ lib.optionals withVtk [
(lib.cmakeBool "USE_VTK" true)
(lib.cmakeFeature "3RDPARTY_VTK_INCLUDE_DIR" "${lib.getDev vtk}/include/vtk")
];
passthru = {
tests = {
withVtk = opencascade-occt.override ({ withVtk = true; });
};
};
meta = with lib; {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
@@ -63,5 +86,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ amiloradovsky ];
platforms = platforms.all;
};
}
pkgs/by-name/op/opencascade-occt/vtk-draw-conditional-glx.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86905287dc..19214e8f2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -623,5 +623,9 @@ if (USE_VTK)
add_definitions (-DHAVE_VTK)
set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE)
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
+ if (DEFINED VTK_USE_X AND NOT VTK_USE_X)
+ message (STATUS "Info: TKIVtkDraw toolkits excluded due to VTK has no glx support")
+ list (REMOVE_ITEM BUILD_TOOLKITS TKIVtkDraw)
+ endif()
else()
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
pkgs/by-name/ow/owocr/package.nix
+1 -1
View File
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication {
pyjson5 # Google Lens
google-cloud-vision
manga-ocr
rapidocr-onnxruntime
rapidocr
requests # winRT OCR
];
pkgs/by-name/pa/paratest/composer.lock
Generated
+349 -213
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/pa/paratest/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
(php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject2
(finalAttrs: {
pname = "paratest";
version = "7.8.2";
version = "7.12.0";
src = fetchFromGitHub {
owner = "paratestphp";
repo = "paratest";
tag = "v${finalAttrs.version}";
hash = "sha256-OCZOpCjFORk5ZcImM8mArQSgK9MLneTC6TxGTNPqvWk=";
hash = "sha256-EH9lKI61hYYmTe7T8j1CIwiuRqgkouWnapJWvqo9iQQ=";
};
composerLock = ./composer.lock;
vendorHash = "sha256-c2bBhJ9NvNk7Cz5RmNfgN2Q9SUV0iZ3/IhvzuAJtlQk=";
vendorHash = "sha256-8IpgE/s0ooZoecd7kVMixd5EGHcu/aNuMJ5RX6Zzt6w=";
nativeInstallCheckInputs = [
versionCheckHook
pkgs/by-name/pc/pcl/package.nix
+3 -3
View File
@@ -6,7 +6,7 @@
# nativeBuildInputs
cmake,
libsForQt5,
qt6,
pkg-config,
# buildInputs
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
qt6.wrapQtAppsHook
pkg-config
]
++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
eigen
libXt
libpcap
libsForQt5.qtbase
qt6.qtbase
libusb1
nanoflann
]
pkgs/by-name/pg/pg_checksums/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
clangStdenv.mkDerivation rec {
pname = "pg_checksums";
version = "1.2";
version = "1.3";
src = fetchFromGitHub {
owner = "credativ";
repo = "pg_checksums";
rev = version;
sha256 = "sha256-joGaCoRMGpEqq7pnT4Qd7XySjZ5wlZPW27WfOv1UFF4=";
sha256 = "sha256-iPgiiOxj3EDK7uf0D94oZSGz3RQbK3yEvdKNCW2Q1N0=";
};
nativeBuildInputs = [
pkgs/by-name/pg/pgadmin4/missing-hashes.json
+19 -19
View File
@@ -21,23 +21,23 @@
"@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b",
"@img/sharp-win32-ia32@npm:0.34.3": "eef220adf1240429f72d9a9aadc22ccb741889785fa025396cfed41603364990b5f3841cee4d60525b22e65f36c7416297581300c873268fe2b7bb67087ada73",
"@img/sharp-win32-x64@npm:0.34.3": "5a5d2624bea7a31393b5a89738ad22a2b020a67f5e5b9eb40063510b514e8516b0fb4e320ff9eb1d32fa2ee3b4c3a0387333d051da28d93957116cbbd63b5fe0",
"@unrs/resolver-binding-android-arm-eabi@npm:1.11.0": "c1b6a9231008b88b21ae121b947704c933bed766f429ee30e464ce8602793ad8420dee1107e5a389d358b9fb9130c1c04a45c54fd23f76fffc148322f77aac21",
"@unrs/resolver-binding-android-arm64@npm:1.11.0": "30870e5ceee3dd1be8150d1c7d719bd459ebdc1c7134e0fdf1f0864f15d395d490966373895728dc05a56ea19acce6a210826acce7fb4ae2806805b04204498b",
"@unrs/resolver-binding-darwin-arm64@npm:1.11.0": "050dee0e5fdbcb4104dba8ecdff32a37abc349406fd3f20f7aa5b90eff446db7791a948c9d508d0f801c21d697d88082d974ebd7eb034257bacfd1b91c9e52fa",
"@unrs/resolver-binding-darwin-x64@npm:1.11.0": "c88bd64753d75539d66fb149f190edafb6415cf178619b27d778b98f6aeb1c538730842f522b7ce0b209ed07c73644d729c55883b3d854317c8395c1e36325e9",
"@unrs/resolver-binding-freebsd-x64@npm:1.11.0": "f0da5e7d2ddc0c6af523741dc0395340c7cd908510c342a0e8a20e2281fdc7e9b965339d1a337cf358883a3e41b393e26315950c9ab3594c342a758065e83f01",
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.0": "e3379d1e50209ea97066f7e275285fa9fdafe51e0b55786283cf72f6fde0d7b2bcbadf5443f8fe4d4852033ee9737ea4965b768660fb8fe5424f8df383eb1e63",
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.0": "af37c332162f948867da2ce5c0cf2482447d3458437116f90e9a7bdbfb69ff7ce64151c5aacd6b82ad0d0b49bbca13cca098bc448fe736e7b2451d3def580dcc",
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.0": "9b0b1649b6493af4383e92453699f970acce726e69f666ba9f23ee7cd43393bce56ed18aa1d7d54550e17e46cd814eb2fd5a78fab64b2794b2647bc6f081f38a",
"@unrs/resolver-binding-linux-arm64-musl@npm:1.11.0": "defe8b45c1700d577cc5d7b672bbde3b22b5e8ceaa9778742c7b6735665e9e778cc4223a230a8d6c8175ece6bbe896dfb4c142be9f4c9dac35bd8c131ae0bb23",
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.0": "14ef4060c46d15b656e8b9d76da3d52251e9b2ac9e72036d6563cea82912cfb3c1ec054772641427e2422d8701275692c8820be8870feea710de212ecb286c43",
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.0": "b781e07bbdf954976f057242b5b450c85866b6cafbad316dfde45f7ef323b55ce85127cd1275e180efa091046347edb1486b7e551eb3f0f2ff462668998e426b",
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.0": "be1be1eee6f46549473392ed8f0625127e1cad3aa5bc4979d9e1d9bbb99274b78451aab2318b3e2573be1096f845a3d4014de1888f6055b0135596bc8a475311",
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.0": "1ec2f875f3548dc1646ab6a2a5d3143872b15797ac11842aff61f01c90c7239752fe2e634ce8da6f8908630a8132a0e0e0c3cff45719802fec464d53fcb1e64d",
"@unrs/resolver-binding-linux-x64-gnu@npm:1.11.0": "1257c1d3d37a1b47d0b50f68ebe6401f5f38f2a95635e475178a159c95c9a8c78fe6455bb93ff2dfc7885174e15b4df8d3fcba3f1dfa6a65662d9ec92eb7c34d",
"@unrs/resolver-binding-linux-x64-musl@npm:1.11.0": "af64c0803ac865d8726c45ed9208110d8720df441ed5da6b0a9667ecb963c7cd3e3ee5bccc7a97e73793e30dd7421e468560428e73469ad1513ed4c76441ee3d",
"@unrs/resolver-binding-wasm32-wasi@npm:1.11.0": "7172db7c1cd756c95ba7ba6f49526ac7be03960cd7928ec9fd5c757001d28fa2bf652a31671ac3b131bb37e627bd4b6f592023a9f5b6b820f33ad93cc6b88acf",
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.0": "a0ffc06551498f263547a3371252f2ff8ce38da28f726ae8d6c4e1be8e968596e0b3fad8fadcc01856bde845733a8527d4b55727b9fbd1774da5728423a76181",
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.0": "64478bb41d415cd2ac220b3518e286e24bbb18f50083545d1d8a40b565caaa24d72f43fb79c57f1ca919591870e27289ddf3c69cb5b763fd686c354fdd1e6e1b",
"@unrs/resolver-binding-win32-x64-msvc@npm:1.11.0": "9b44241725f19ba4aeb9377f7be3153b3e36971f9224b502921cffb72122ed9fa9f7b0a77e3bd6ec941c18f8b161782b4e8ea43eafc61e9d575d40c4c88c367b"
"@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
"@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
"@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
"@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
"@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
"@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
"@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
"@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
"@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
"@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
}
pkgs/by-name/pg/pgadmin4/package.nix
+3 -3
View File
@@ -20,14 +20,14 @@
let
pname = "pgadmin";
version = "9.6";
yarnHash = "sha256-G3iG11nPEtco7FJe1H4s85tMpHqmUgPbj68gADBqDfY=";
version = "9.7";
yarnHash = "sha256-c+qPT9E4a/xqgSmfE0OnzLP31k0dXC6b2fwXnBKZjuE=";
src = fetchFromGitHub {
owner = "pgadmin-org";
repo = "pgadmin4";
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
hash = "sha256-9WYyfioDb2eDf4oeMQ0kF/NUOuwki5gVZjlmels/+1g=";
hash = "sha256-UpeqEjaXm4mHVLpgJM1/pa2mhM6WbqW4A4U9u3RK+qw=";
};
# keep the scope, as it is used throughout the derivation and tests
pkgs/by-name/ph/phpunit/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "phpunit";
version = "12.3.5";
version = "12.3.7";
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
tag = finalAttrs.version;
hash = "sha256-dWTV7TgVSRuqbKIlW7U4NeKL/7DnHplyQkTeVU+ECos=";
hash = "sha256-v7LXp0TTtGLN0zRZN7GBGlwX7Bb+xNVCN3UYYCt0w1E=";
};
vendorHash = "sha256-b5fj5HmaqG6WM7b/nvT1xig3RReL9XSYAiCoE9LiyAc=";
vendorHash = "sha256-9cuMWzWvSZy9Djlkk8pw7cOaqEp5060WMGT4FzNSmb4=";
passthru = {
updateScript = nix-update-script { };
pkgs/by-name/pl/plasmusic-toolbar/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plasmusic-toolbar";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "ccatterina";
repo = "plasmusic-toolbar";
tag = "v${finalAttrs.version}";
hash = "sha256-Kjzutah8CIHN3NZcxGB1FXlCNn5dnTQxJITUptaXNrs=";
hash = "sha256-yIEgqMIfxDqEbIp4OcgBQz3oPvGE/oBiuNkRMPXZv1A=";
};
installPhase = ''
pkgs/by-name/pr/promptfoo/package-lock.json
Generated
+40012
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/pr/promptfoo/package.nix
+24 -9
View File
@@ -4,27 +4,42 @@
lib,
}:
buildNpmPackage rec {
buildNpmPackage (finalAttrs: {
pname = "promptfoo";
version = "0.79.0";
version = "0.117.4";
src = fetchFromGitHub {
owner = "promptfoo";
repo = "promptfoo";
rev = "${version}";
hash = "sha256-sMBgjxPzG3SJ7RS4oTtOq7hJ1MYaKW3/6FF8Pn5l89c=";
tag = finalAttrs.version;
hash = "sha256-0QF6sJ0SI6NA0yBdB7a4+ae8CcD0IiWYuFJNteZxvN8=";
};
npmDepsHash = "sha256-tnzeEFEc/BMN/VsoNHWJIWDOvupHfddqI6020Q4M0RM=";
# npm error code ENOTCACHED
# npm error request to https://registry.npmjs.org/undici-types failed: cache mode is 'only-if-cached' but no cached response is available
# deleted package-lock.json and ran `npm update` to get a new lock file
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
npmDepsHash = "sha256-sRTnIZqXbtiwk/jSTLIWLYwsNbR5nOL2d8Qsa3iF/Sg=";
dontNpmBuild = true;
# don't fetch playwright binary
env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
# cleanup dangling symlinks for workspaces
preFixup = ''
rm -rf $out/lib/node_modules/promptfoo/node_modules/app $out/lib/node_modules/promptfoo/node_modules/promptfoo-docs
'';
meta = {
description = "Test your prompts, models, RAGs. Evaluate and compare LLM outputs, catch regressions, and improve prompt quality";
mainProgram = "promptfoo";
homepage = "https://www.promptfoo.dev/";
changelog = "https://github.com/promptfoo/promptfoo/releases/tag/${version}";
changelog = "https://github.com/promptfoo/promptfoo/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.nathanielbrough ];
maintainers = with lib.maintainers; [
nathanielbrough
jk
];
};
}
})
pkgs/by-name/ro/rofi-games/package.nix
+4 -4
View File
@@ -14,18 +14,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rofi-games";
version = "1.12.2";
version = "1.12.3";
src = fetchFromGitHub {
owner = "Rolv-Apneseth";
repo = "rofi-games";
tag = "v${finalAttrs.version}";
hash = "sha256-6sopWMiXA6UmZP2wNbl7RlDDBRz4rNLPrNd6XnaFQko=";
hash = "sha256-1/bQWiFbGrodztNVNNmTOknUGjj3U0WLIhYMEb8ItzY=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-5ofRwE68SNFYcnBiGORsTjl6jSeDJ+6PJH+/SA1l07g=";
hash = "sha256-I0ikJ06goX9zu+7VnMhAmxNvjJdsnoFRbuphwPZd6Wk=";
};
patches = [
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/Rolv-Apneseth/rofi-games/blob/${finalAttrs.src.rev}/CHANGELOG.md";
description = "Rofi plugin which adds a mode that will list available games for launch along with their box art";
homepage = "https://github.com/Rolv-Apneseth/rofi-games";
license = lib.licenses.gpl2Only;
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ tomasajt ];
platforms = lib.platforms.linux;
};
pkgs/by-name/rt/rtabmap/package.nix
+10 -11
View File
@@ -6,7 +6,7 @@
# nativeBuildInputs
cmake,
libsForQt5,
qt6,
pkg-config,
wrapGAppsHook3,
@@ -28,14 +28,16 @@
libGL,
libGLU,
librealsense,
vtkWithQt5,
vtkWithQt6,
zed-open-capture,
hidapi,
# passthru
gitUpdater,
}:
let
pcl' = pcl.override { vtk = vtkWithQt6; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "rtabmap";
version = "0.22.1";
@@ -49,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
qt6.wrapQtAppsHook
pkg-config
wrapGAppsHook3
];
@@ -57,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
## Required
opencv
opencv.cxxdev
pcl
pcl'
liblapack
xorg.libSM
xorg.libICE
@@ -75,21 +77,18 @@ stdenv.mkDerivation (finalAttrs: {
freenect
libdc1394
librealsense
libsForQt5.qtbase
qt6.qtbase
libGL
libGLU
vtkWithQt5
zed-open-capture
hidapi
];
# Configure environment variables
NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions -I${vtkWithQt5}/include/vtk";
NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions";
cmakeFlags = [
(lib.cmakeFeature "VTK_QT_VERSION" "5")
(lib.cmakeFeature "VTK_DIR" "${vtkWithQt5}/lib/cmake/vtk-${lib.versions.majorMinor vtkWithQt5.version}")
(lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${vtkWithQt5}/include/vtk:${pcl}/include/pcl-${lib.versions.majorMinor pcl.version}")
(lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${pcl'}/include/pcl-${lib.versions.majorMinor pcl'.version}")
];
passthru = {
pkgs/by-name/sf/sftool-gui/package.nix
+2 -2
View File
@@ -18,12 +18,12 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sftool-gui";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "OpenSiFli";
repo = "sftool-gui";
tag = "v${finalAttrs.version}";
hash = "sha256-FD3eQN4Uto4q7gdyfK5KUyZJ5ZiIJeUKkqaCZRWdQNo=";
hash = "sha256-kjxUl9YrvTgJby+FvUbx5ugucK8NiBqzGBhTi9Zwd1s=";
};
cargoHash = "sha256-XAU3ru+TxUo99OQwcXNLJ8gzBOZUkC8UCAApz7M/QTM=";
pkgs/by-name/si/simplotask/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "simplotask";
version = "1.18.0";
version = "1.19.1";
src = fetchFromGitHub {
owner = "umputun";
repo = "spot";
tag = "v${finalAttrs.version}";
hash = "sha256-0XAxjh9TWMqMkeSEhdgXX9DflHnT40f7VkHgp1QjQUg=";
hash = "sha256-Zu7GkvNVhf6TeZg2AVH8GTi5ORK5aUspSvB1ThOBwTo=";
};
vendorHash = null;
pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch
+11 -6
View File
@@ -1,8 +1,8 @@
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index a24f1b6..4102274 100644
index f6eb4eb..1840db7 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -97,7 +97,7 @@ namespace SourceGit.Native
@@ -119,7 +119,7 @@ namespace SourceGit.Native
}
}
@@ -10,21 +10,26 @@ index a24f1b6..4102274 100644
+ public static string FindExecutable(string filename)
{
var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
var paths = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 5721fe8..bc2a57d 100644
index a021a16..6b3dff0 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -25,13 +25,7 @@ namespace SourceGit.Native
@@ -46,18 +46,7 @@ namespace SourceGit.Native
public string FindGitExecutable()
{
- var gitPathVariants = new List<string>() {
- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git"
- "/usr/bin/git",
- "/usr/local/bin/git",
- "/opt/homebrew/bin/git",
- "/opt/homebrew/opt/git/bin/git"
- };
-
- foreach (var path in gitPathVariants)
- if (File.Exists(path))
- return path;
-
- return string.Empty;
+ return Linux.FindExecutable("git");
}
pkgs/by-name/so/sourcegit/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@
buildDotnetModule (finalAttrs: {
pname = "sourcegit";
version = "2025.25";
version = "2025.29";
src = fetchFromGitHub {
owner = "sourcegit-scm";
repo = "sourcegit";
tag = "v${finalAttrs.version}";
hash = "sha256-WPwvOfbCOCQBOvJU2HuGU9/Rh00MCmhZEaKn9Nr1Q0I=";
hash = "sha256-ptHiC5BaX0EP2uInGE7/FV61wsCU2V+FE1VHxJKN+70=";
};
patches = [ ./fix-darwin-git-path.patch ];
pkgs/by-name/st/stevenblack-blocklist/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stevenblack-blocklist";
version = "3.16.13";
version = "3.16.15";
src = fetchFromGitHub {
owner = "StevenBlack";
repo = "hosts";
tag = finalAttrs.version;
hash = "sha256-tvtHai3Z/kXhHSVOwopJBqTwrBFckcuj/GSe8wtk7u4=";
hash = "sha256-FlYlQZ/NqG0Z6tyakwVYJihs0jYi/gBoKF2694O/TSw=";
};
outputs = [
pkgs/by-name/st/stylance-cli/package.nix
+3 -3
View File
@@ -5,14 +5,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "stylance-cli";
version = "0.7.0";
version = "0.7.1";
src = fetchCrate {
inherit pname version;
hash = "sha256-NIUZvyT5CetUjHDoMYaXIZ2nhwH9SaXPnatvkkQhChA=";
hash = "sha256-Cdv+Lz+l0+8Jdk9stHACXDbUPedM/YryDMExdsqVvsU=";
};
cargoHash = "sha256-JCmxbpwJOIbY9Vr+LZxf9x1eabUD25uuLDQ/KW5ChnM=";
cargoHash = "sha256-cwgR5AHCeS9YkaJlyFxvEOrBXg7/tXNGXgtSEPHAwm4=";
meta = {
description = "Library and cli tool for working with scoped CSS in rust";
pkgs/by-name/ta/tailspin/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tailspin";
version = "5.4.5";
version = "5.5.0";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "tailspin";
tag = finalAttrs.version;
hash = "sha256-Cl1S183iAyFPa3KijHCn/CyRXQBluphNMQFAgdIOzuM=";
hash = "sha256-coatx8Ud6iLnXvr+/X9hUEe3+0j9jnP5N3+aHQ+eWV8=";
};
cargoHash = "sha256-2p4jkta6w2vje169KCHw0ErC7FweLabF6B7ZIkTmNBI=";
cargoHash = "sha256-7N/vkhytkDF2ef0T6RJv8YzCpjzi+hjg061Uz9dyEM0=";
postPatch = ''
substituteInPlace tests/utils.rs --replace-fail \
pkgs/by-name/ta/task-master-ai/package.nix
+8
View File
@@ -4,6 +4,7 @@
fetchFromGitHub,
nodejs,
nix-update-script,
versionCheckHook,
}:
buildNpmPackage (finalAttrs: {
pname = "task-master-ai";
@@ -20,6 +21,8 @@ buildNpmPackage (finalAttrs: {
dontNpmBuild = true;
npmFlags = [ "--ignore-scripts" ];
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ nodejs ]}" ];
passthru.updateScript = nix-update-script { };
@@ -34,6 +37,11 @@ buildNpmPackage (finalAttrs: {
PUPPETEER_SKIP_DOWNLOAD = 1;
};
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/task-master";
versionCheckProgramArg = "--version";
meta = with lib; {
description = "Node.js agentic AI workflow orchestrator";
homepage = "https://task-master.dev";
pkgs/by-name/ui/uiua/unstable.nix
+3 -3
View File
@@ -1,7 +1,7 @@
rec {
version = "0.17.0-dev.2";
version = "0.17.0-rc.1";
tag = version;
hash = "sha256-n6gNlDL5Dcc8d/t9QSi3LPY3wTyvckkDwucnhpcgkCg=";
cargoHash = "sha256-VXIU5NMboEl56IUXhEkc2ebbVajkhcE9T+X4uTOh48A=";
hash = "sha256-ITV8T3gfP52e8Wtikm5e68FS2Pyh+adOq/G7xpQ46GU=";
cargoHash = "sha256-K8hdkWKcMLw9ImdG0B/VhZV2j6bzMevrwQYEpUlGuzs=";
updateScript = ./update-unstable.sh;
}
pkgs/by-name/up/upterm/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "upterm";
version = "0.15.2";
version = "0.15.3";
src = fetchFromGitHub {
owner = "owenthereal";
repo = "upterm";
rev = "v${version}";
hash = "sha256-hZZAt3KTiDxQteS5InxW+uhdRuwb1GLIARKD35rOWPw=";
hash = "sha256-9h4Poz0hUg5/7CrF0ZzT4KrVaFlhvcorIgZbleMpV6w=";
};
vendorHash = "sha256-i92RshW5dsRE88X8bXyrj13va66cc0Yu/btpR0pvoSM=";
pkgs/by-name/uv/uvwasi/package.nix
+2 -8
View File
@@ -11,21 +11,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "uvwasi";
version = "0.0.21";
version = "0.0.23";
src = fetchFromGitHub {
owner = "nodejs";
repo = "uvwasi";
tag = "v${finalAttrs.version}";
hash = "sha256-po2Pwqf97JXGKY8WysvyR1vSkqQ4XIF0VQG+83yV9nM=";
hash = "sha256-+vz/qTMRRDHV1VE4nny9vYYtarZHk1xoM4EZiah3jnY=";
};
# Patch was sent upstream: https://github.com/nodejs/uvwasi/pull/302.
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}/uvwasi' 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}'
'';
outputs = [
"out"
];
pkgs/by-name/v2/v2raya/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@
}:
let
pname = "v2raya";
version = "2.2.6.7";
version = "2.2.7.1";
src = fetchFromGitHub {
owner = "v2rayA";
repo = "v2rayA";
tag = "v${version}";
hash = "sha256-UnA7+DJEzWekPhNhwNcnJ6Carx6IoExauZRjsfWBERM=";
hash = "sha256-yKXtohZVmeeIaHIjdGIGQ7aIREIjup/bOpozjw9cmEw=";
postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
};
pkgs/by-name/vg/vgmtools/package.nix
+3 -3
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "vgmtools";
version = "0.1-unstable-2025-04-05";
version = "0.1-unstable-2025-08-20";
src = fetchFromGitHub {
owner = "vgmrips";
repo = "vgmtools";
rev = "cd9fb6c0693b28ea2c18511aa6416637bc5c91f6";
hash = "sha256-mdHGK2hru7F66lHQtEMpvys8ZzMQMGyzxvPj625bvn8=";
rev = "7e071f9fff11031e6bbe3ccc73d180be08727804";
hash = "sha256-GTdMLDGVAeV4aIrnKYc/NE1FVU5DS1TspeTcx4qwUQA=";
};
nativeBuildInputs = [
pkgs/by-name/w_/w_scan/package.nix
-29
View File
@@ -1,29 +0,0 @@
{
lib,
stdenv,
fetchurl,
}:
stdenv.mkDerivation rec {
pname = "w_scan";
version = "20170107";
src = fetchurl {
url = "http://wirbel.htpc-forum.de/w_scan/${pname}-${version}.tar.bz2";
sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q";
};
# Workaround build failure on -fno-common toolchains:
# ld: char-coding.o:/build/w_scan-20170107/si_types.h:117: multiple definition of
# `service_t'; countries.o:/build/w_scan-20170107/si_types.h:117: first defined here
env.NIX_CFLAGS_COMPILE = "-fcommon";
meta = {
description = "Small CLI utility to scan DVB and ATSC transmissions";
homepage = "http://wirbel.htpc-forum.de/w_scan/index_en.html";
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.nico202 ];
license = lib.licenses.gpl2;
mainProgram = "w_scan";
};
}
pkgs/by-name/we/wealthfolio/package.nix
+3 -3
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wealthfolio";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "afadil";
repo = "wealthfolio";
rev = "v${finalAttrs.version}";
hash = "sha256-M1HaExPwm0T2EgKqOEubikIJ1tnR8qHCrmsgudY6GHY=";
hash = "sha256-XuZy1D8SMIHGTQ6XY6jFUnVWXvaAXtUBMMPCz8TakSA=";
};
pnpmDeps = pnpm_9.fetchDeps {
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
src
cargoRoot
;
hash = "sha256-3PRIHQLYpJ91Xkkv8ktfsWBsRfta6wMu+MuYlL5CYD0=";
hash = "sha256-918Sr5bVKfvdMrHqLTyUbH0tH52YFcKZCQDRQslAcW4=";
};
nativeBuildInputs = [
pkgs/by-name/we/weblate/package.nix
+2 -2
View File
@@ -27,7 +27,7 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "weblate";
version = "5.13";
version = "5.13.1";
pyproject = true;
@@ -40,7 +40,7 @@ python.pkgs.buildPythonApplication rec {
owner = "WeblateOrg";
repo = "weblate";
tag = "weblate-${version}";
hash = "sha256-fx07SmQodgC4bI/zQT6TNcvGYzVoKT42aXpUx5SlUrk=";
hash = "sha256-so+bpjuWgyLiSfTCL8+WqGNZYaqnENKXWqiojD47WwU=";
};
build-system = with python.pkgs; [ setuptools ];
pkgs/by-name/wh/whisky/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "whisky";
version = "2.3.2";
version = "2.3.5";
src = fetchzip {
extension = "zip";
name = "Whisky.app";
url = "https://github.com/IsaacMarovitz/Whisky/releases/download/v${finalAttrs.version}/Whisky.zip";
hash = "sha256-rA2z3/So54KkXGc3CpF4m46ImL/SokSPxHmmXP0bfcY=";
hash = "sha256-tETDj83dCZJdJCGpXyK6pdhwr70sYWCknBHybMAWHzU=";
};
sourceRoot = ".";
pkgs/by-name/wh/whistle/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "whistle";
version = "2.9.100";
version = "2.9.101";
src = fetchFromGitHub {
owner = "avwo";
repo = "whistle";
rev = "v${version}";
hash = "sha256-yMyIsqIq5AG98b+ed4c0xjU6Jndi6qGc2aZwjr/28vk=";
hash = "sha256-Al/Rn8THQBqTx04H30PoqF4Ffm9538FiDbiPUSz0GQ4=";
};
npmDepsHash = "sha256-RouX2xRyhiaORnJVDDHdheyRqKYsYXxfk0O/BzgI7lA=";
npmDepsHash = "sha256-UJRPeMredj/BX/ucIR1sWW+qd6awWXoEmn8Huw3g/7M=";
dontNpmBuild = true;
pkgs/by-name/xb/xbyak/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xbyak";
version = "7.29.2";
version = "7.30";
src = fetchFromGitHub {
owner = "herumi";
repo = "xbyak";
tag = "v${finalAttrs.version}";
hash = "sha256-dKUb6zkMLW6VujTscD3aZdkoj5Q2Jlui/o3g8HOhZEc=";
hash = "sha256-vHm/xN3n2Xc2zPw2l3q4BXDqPluP9VlndlJIOmLBYGU=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/adafruit-platformdetect/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.83.0";
version = "3.83.1";
pyproject = true;
src = fetchPypi {
pname = "adafruit_platformdetect";
inherit version;
hash = "sha256-woiuT3RnxDkLtDaBAh9vdUvsMKAp3s5ahpJNS1T2DcQ=";
hash = "sha256-nRmYJteKu2WXL9rqt7pp3V7hxEZywHvotd9ow77g+JA=";
};
build-system = [ setuptools-scm ];
pkgs/development/python-modules/dissect-hypervisor/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dissect-hypervisor";
version = "3.18";
version = "3.19";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.hypervisor";
tag = version;
hash = "sha256-1M9KDbLNFBmB/iSMqRdNlW3WEZugJxhXJJgcijK61kA=";
hash = "sha256-P08gTV/gcwsk1JqwCUHc6jPKAm9MTaCgdmzPxAx23Ts=";
};
build-system = [
pkgs/development/python-modules/docling-jobkit/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
# optional dependencies
tesserocr,
rapidocr-onnxruntime,
rapidocr,
onnxruntime,
ray,
@@ -68,7 +68,7 @@ buildPythonPackage rec {
optional-dependencies = {
tesserocr = [ tesserocr ];
rapidocr = [
rapidocr-onnxruntime
rapidocr
onnxruntime
];
ray = [ ray ];
pkgs/development/python-modules/docling-serve/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
websockets,
tesserocr,
typer,
rapidocr-onnxruntime,
rapidocr,
onnxruntime,
torch,
torchvision,
@@ -81,7 +81,7 @@ buildPythonPackage rec {
tesserocr
];
rapidocr = [
rapidocr-onnxruntime
rapidocr
onnxruntime
];
cpu = [
pkgs/development/python-modules/docling/default.nix
+3 -3
View File
@@ -30,7 +30,7 @@
pypdfium2,
python-docx,
python-pptx,
rapidocr-onnxruntime,
rapidocr,
requests,
rtree,
scipy,
@@ -90,7 +90,7 @@ buildPythonPackage rec {
pypdfium2
python-docx
python-pptx
rapidocr-onnxruntime
rapidocr
requests
rtree
scipy
@@ -112,7 +112,7 @@ buildPythonPackage rec {
];
rapidocr = [
onnxruntime
rapidocr-onnxruntime
rapidocr
];
tesserocr = [
tesserocr
pkgs/development/python-modules/greynoise/default.nix
+7 -2
View File
@@ -9,6 +9,7 @@
click-default-group,
click-repl,
dict2xml,
hatchling,
jinja2,
more-itertools,
requests,
@@ -21,7 +22,7 @@
buildPythonPackage rec {
pname = "greynoise";
version = "3.0.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -32,7 +33,11 @@ buildPythonPackage rec {
hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s=";
};
propagatedBuildInputs = [
build-system = [
hatchling
];
dependencies = [
click
ansimarkup
cachetools
pkgs/development/python-modules/highdicom/default.nix
+2 -20
View File
@@ -7,6 +7,7 @@
numpy,
pillow,
pydicom,
pyjpegls,
pylibjpeg,
pylibjpeg-libjpeg,
pylibjpeg-openjpeg,
@@ -36,6 +37,7 @@ buildPythonPackage rec {
numpy
pillow
pydicom
pyjpegls
typing-extensions
];
@@ -47,10 +49,6 @@ buildPythonPackage rec {
];
};
pythonRemoveDeps = [
"pyjpegls" # not directly used
];
nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.libjpeg;
preCheck = ''
export HOME=$TMP/test-home
@@ -58,22 +56,6 @@ buildPythonPackage rec {
ln -s ${pydicom.passthru.pydicom-data}/data_store/data $HOME/.pydicom/data
'';
disabledTests = [
# require pyjpegls
"test_construction_10"
"test_jpegls_monochrome"
"test_jpegls_rgb"
"test_jpeglsnearlossless_monochrome"
"test_jpeglsnearlossless_rgb"
"test_multi_frame_sm_image_ushort_encapsulated_jpegls"
"test_monochrome_jpegls"
"test_monochrome_jpegls_near_lossless"
"test_rgb_jpegls"
"test_construction_autotile"
"test_pixel_types_fractional"
"test_pixel_types_labelmap"
];
pythonImportsCheck = [
"highdicom"
"highdicom.legacy"
pkgs/development/python-modules/iplotx/default.nix
+6 -4
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "iplotx";
version = "0.6.1";
version = "0.6.5";
pyproject = true;
src = fetchFromGitHub {
owner = "fabilab";
repo = "iplotx";
tag = version;
hash = "sha256-RleGCDsH9VLX5hgU1l5pN6a1x9p52VA35CM5B9rJiy0=";
hash = "sha256-k/psY/xwNuG5/1pLmJOpC8U3Il4v2cicwTy+pR9ZNC8=";
};
build-system = [ hatchling ];
@@ -45,11 +45,13 @@ buildPythonPackage rec {
export MPLCONFIGDIR=$(mktemp -d)
'';
# These four tests result in an ImageComparisonFailure
disabledTests = [
"test_labels"
# These tests result in an ImageComparisonFailure
"test_complex"
"test_complex_rotatelabels"
"test_directed_graph"
"test_display_shortest_path"
"test_labels"
"test_labels_and_colors"
];

Some files were not shown because too many files have changed in this diff Show More