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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-05-22 06:06:04 +00:00
committed by GitHub
parent 0870c6fca2 218a02803b
commit 6d6d5d757c
35 changed files with 540 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/programs/direnv.nix
+14 -15
View File
@@ -119,7 +119,7 @@ in
zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration ''
if ${lib.boolToString cfg.loadInNixShell} || printenv PATH | grep -vqc '/nix/store'; then
eval "$(${lib.getExe cfg.finalPackage} hook zsh)"
eval "$(${lib.getExe cfg.finalPackage} hook zsh)"
fi
'';
@@ -127,14 +127,13 @@ in
#$IN_NIX_SHELL for "nix-shell"
bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ''
if ${lib.boolToString cfg.loadInNixShell} || [ -z "$IN_NIX_SHELL$NIX_GCROOT$(printenv PATH | grep '/nix/store')" ] ; then
eval "$(${lib.getExe cfg.finalPackage} hook bash)"
eval "$(${lib.getExe cfg.finalPackage} hook bash)"
fi
'';
fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
if ${lib.boolToString cfg.loadInNixShell};
or printenv PATH | grep -vqc '/nix/store';
${lib.getExe cfg.finalPackage} hook fish | source
if ${lib.boolToString cfg.loadInNixShell}; or printenv PATH | grep -vqc '/nix/store';
${lib.getExe cfg.finalPackage} hook fish | source
end
'';
@@ -169,18 +168,18 @@ in
source ${cfg.nix-direnv.package}/share/nix-direnv/direnvrc
''}
#Load direnvrcExtra
${cfg.direnvrcExtra}
#Load direnvrcExtra
${cfg.direnvrcExtra}
#Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc)
direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}"
if [[ -f $direnv_config_dir_home/direnvrc ]]; then
source "$direnv_config_dir_home/direnvrc" >&2
elif [[ -f $HOME/.direnvrc ]]; then
source "$HOME/.direnvrc" >&2
fi
#Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc)
direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}"
if [[ -f $direnv_config_dir_home/direnvrc ]]; then
source "$direnv_config_dir_home/direnvrc" >&2
elif [[ -f $HOME/.direnvrc ]]; then
source "$HOME/.direnvrc" >&2
fi
unset direnv_config_dir_home
unset direnv_config_dir_home
'';
"direnv/lib/zz-user.sh".text = ''
nixos/modules/services/web-apps/mealie.nix
+1 -1
View File
@@ -76,7 +76,7 @@ in
API_PORT = toString cfg.port;
BASE_URL = "http://localhost:${toString cfg.port}";
DATA_DIR = "/var/lib/mealie";
NLTK_DATA = pkgs.nltk-data.averaged_perceptron_tagger_eng;
NLTK_DATA = pkgs.nltk-data.averaged-perceptron-tagger-eng;
} // (builtins.mapAttrs (_: val: toString val) cfg.settings);
serviceConfig = {
pkgs/applications/networking/cluster/terraform/default.nix
+2 -2
View File
@@ -194,8 +194,8 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.12.0";
hash = "sha256-+EjsKl13kx3uJ50TrZIJLrvf4RBWDJsp1PD1dwtP6XA=";
version = "1.12.1";
hash = "sha256-ikpSkcP4zt91Lf9gziytlZ4P27A0IP2qL+H2Lp9Cspg=";
vendorHash = "sha256-zWNLIurNP5e/AWr84kQCb2+gZIn6EAsuvr0ZnfSq7Zw=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
pkgs/build-support/bintools-wrapper/default.nix
+1 -1
View File
@@ -492,7 +492,7 @@ stdenvNoCC.mkDerivation {
darwinMinVersionVariable
;
}
// lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
// lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
# Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
};
pkgs/build-support/cc-wrapper/default.nix
+1 -1
View File
@@ -889,7 +889,7 @@ stdenvNoCC.mkDerivation {
# These will become empty strings when not targeting Darwin.
inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;
}
// lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
// lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
# Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
};
pkgs/build-support/trivial-builders/default.nix
+11 -7
View File
@@ -1022,6 +1022,12 @@ rec {
postPatch ? "",
...
}@args:
assert lib.assertMsg (
!args ? meta
) "applyPatches will not merge 'meta', change it in 'src' instead";
assert lib.assertMsg (
!args ? passthru
) "applyPatches will not merge 'passthru', change it in 'src' instead";
if patches == [ ] && prePatch == "" && postPatch == "" then
src # nothing to do, so use original src to avoid additional drv
else
@@ -1051,19 +1057,17 @@ rec {
phases = "unpackPhase patchPhase installPhase";
installPhase = "cp -R ./ $out";
}
# Carry and merge information from the underlying `src` if present.
// (optionalAttrs (src ? meta || args ? meta) {
meta = src.meta or { } // args.meta or { };
# Carry (and merge) information from the underlying `src` if present.
// (optionalAttrs (src ? meta) {
inherit (src) meta;
})
// (optionalAttrs (extraPassthru != { } || src ? passthru || args ? passthru) {
passthru = extraPassthru // src.passthru or { } // args.passthru or { };
// (optionalAttrs (extraPassthru != { } || src ? passthru) {
passthru = extraPassthru // src.passthru or { };
})
# Forward any additional arguments to the derviation
// (removeAttrs args [
"src"
"name"
"meta"
"passthru"
"patches"
"prePatch"
"postPatch"
pkgs/by-name/ar/arkade/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "arkade";
version = "0.11.38";
version = "0.11.39";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
hash = "sha256-V6ms3Av0/g2S7Q2NLltz7CnnvE1m+cemmwoHKL1e0tM=";
hash = "sha256-ILiiK8WWuSB1QKTo89/JJ5ADCBKbRXVn9fNVL3c7y0s=";
};
env.CGO_ENABLED = 0;
pkgs/by-name/bi/bind/package.nix
+13 -10
View File
@@ -27,11 +27,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bind";
version = "9.20.8";
version = "9.20.9";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
hash = "sha256-MATZnEdr6rSamGwtSfkC4s13ZsmrGLJh6LNTyr86BLU=";
hash = "sha256-PSaQDtnJqFkHP/6puX4pLBJI2tGCebF7BfyyPDCR+G0=";
};
outputs = [
@@ -136,13 +136,16 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
tests = {
withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
inherit (nixosTests) bind;
prometheus-exporter = nixosTests.prometheus-exporters.bind;
kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;
kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;
};
tests =
{
withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
inherit (nixosTests) bind;
prometheus-exporter = nixosTests.prometheus-exporters.bind;
}
// lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;
kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;
};
updateScript = gitUpdater {
# No nicer place to find latest stable release.
@@ -160,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/doc/arm/html/notes.html#notes-for-bind-${
lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version
}";
maintainers = with maintainers; [ globin ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
outputsToInstall = [
pkgs/by-name/bp/bpfilter/package.nix
+2 -2
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bpfilter";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "bpfilter";
tag = "v${finalAttrs.version}";
hash = "sha256-k8zl6WQ5htxu2nsubOoqMg69E/z+4TQTtywIfZG/G7U=";
hash = "sha256-Z0L4sY944cj/rqfOwwjNWOU0tZDAsZ1ocf4/djHad2Q=";
};
nativeBuildInputs = [
pkgs/by-name/ci/circt/package.nix
-6
View File
@@ -104,12 +104,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "check-circt check-circt-integration";
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
echo moving libarc-jit-env.dylib to '$lib' before check because archilator links to the output path
mkdir -pv $lib/lib
cp -v ./lib/libarc-jit-env.dylib $lib/lib
'';
outputs = [
"out"
"lib"
pkgs/by-name/cp/cppfront/package.nix
+105
View File
@@ -0,0 +1,105 @@
{
stdenv,
lib,
fetchFromGitHub,
installShellFiles,
nix-update-script,
versionCheckHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cppfront";
version = "0.8.1";
src = fetchFromGitHub {
owner = "hsutter";
repo = "cppfront";
tag = "v${finalAttrs.version}";
hash = "sha256-QYjon2EpNexYa2fl09AePkpq0LkRVBOQM++eldcVMvI=";
};
nativeBuildInputs = [
installShellFiles
];
# Remove with next release
postPatch = ''
substituteInPlace source/version.info \
--replace-fail "0.8.0" "0.8.1"
'';
dontConfigure = true;
buildPhase = ''
runHook preBuild
$CXX source/cppfront.cpp -std=c++20 -o cppfront
runHook postBuild
'';
installPhase = ''
runHook preInstall
installBin cppfront
cp -r include $out/include
runHook postInstall
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "-version";
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
tests.hello-world = stdenv.mkDerivation (finalAttrs': {
pname = "${finalAttrs.pname}-hello-world-test";
inherit (finalAttrs) version src;
sourceRoot = "${finalAttrs'.src.name}/regression-tests";
nativeBuildInputs = [
finalAttrs.finalPackage
installShellFiles
];
postBuild = ''
cppfront pure2-hello.cpp2
$CXX -std=c++20 -o pure2-hello{,.cpp}
'';
postInstall = ''
installBin pure2-hello
'';
doInstallCheck = true;
postInstallCheck = ''
$out/bin/pure2-hello | grep '^Hello \[world\]$' > /dev/null
'';
meta = {
inherit (finalAttrs.meta) maintainers platforms;
mainProgram = "pure2-hello";
};
});
};
meta = {
description = "Experimental compiler from a potential C++ 'syntax 2' (Cpp2) to today's 'syntax 1' (Cpp1)";
homepage = "https://hsutter.github.io/cppfront/";
changelog = "https://github.com/hsutter/cppfront/releases/tag/${finalAttrs.src.tag}";
mainProgram = "cppfront";
license = with lib.licenses; [
asl20
llvm-exception
];
maintainers = with lib.maintainers; [
marcin-serwin
];
platforms = lib.platforms.all;
};
})
pkgs/by-name/cr/crystal-dock/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "crystal-dock";
version = "2.12";
version = "2.14";
src = fetchFromGitHub {
owner = "dangvd";
repo = "crystal-dock";
rev = "v${finalAttrs.version}";
hash = "sha256-8QxewksN4iWFpIChRm0+QnU5MFuup0dO/QNxPBLlmPU=";
hash = "sha256-szW3zIgwy0a9NmEax6xemeCdjs3//r7BRfUDeLv+VxE=";
};
nativeBuildInputs = [
pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
+69
View File
@@ -0,0 +1,69 @@
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
versionCheckHook,
nix-update-script,
stdenv,
}:
buildGoModule (finalAttrs: {
pname = "fluxcd-operator-mcp";
version = "0.20.0";
src = fetchFromGitHub {
owner = "controlplaneio-fluxcd";
repo = "fluxcd-operator";
tag = "v${finalAttrs.version}";
hash = "sha256-GGHufHUqTylgynK19aaj4KAawlzzuz3iSEHa+vVVPMM=";
};
vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY=";
ldflags = [
"-s"
"-w"
"-X main.VERSION=${finalAttrs.version}"
];
subPackages = [ "cmd/mcp" ];
nativeBuildInputs = [ installShellFiles ];
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/flux-operator-mcp";
versionCheckProgramArg = "--version";
doInstallCheck = true;
env.CGO_ENABLED = 0;
postInstall =
''
mv $out/bin/mcp $out/bin/flux-operator-mcp
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
for shell in bash fish zsh; do
installShellCompletion --cmd flux-operator-mcp \
--$shell <($out/bin/flux-operator-mcp completion $shell)
done
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Kubernetes controller for managing the lifecycle of Flux CD";
homepage = "https://fluxcd.control-plane.io/mcp/";
downloadPage = "https://github.com/controlplaneio-fluxcd/flux-operator";
longDescription = ''
The Flux Operator is a Kubernetes CRD controller that manages the lifecycle of CNCF Flux CD
and the ControlPlane enterprise distribution. The operator extends Flux with self-service
capabilities and preview environments for GitLab and GitHub pull requests testing.
'';
changelog = "https://github.com/controlplaneio-fluxcd/flux-operator/releases/tag/v${finalAttrs.version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [
mattfield
];
mainProgram = "flux-operator-mcp";
};
})
pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch
-149
View File
@@ -1,149 +0,0 @@
From 23ddb6ff148ec5c27da050ba0eb7a2e449b8450b Mon Sep 17 00:00:00 2001
From: Yury Shvedov <yury.shvedov@kaspersky.com>
Date: Mon, 4 Nov 2024 14:22:22 +0300
Subject: [PATCH] Gui: take in account module-path argument
Use paths passed with `--module-path` argument to search for preference
packs
Change-Id: If168dbd99a826757290ee6b918f5b712305fe2bb
---
src/Gui/DlgPreferencePackManagementImp.cpp | 16 +++++----
src/Gui/PreferencePackManager.cpp | 39 +++++++++++++++++-----
src/Gui/PreferencePackManager.h | 5 +++
3 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/src/Gui/DlgPreferencePackManagementImp.cpp b/src/Gui/DlgPreferencePackManagementImp.cpp
index a1a0dad41a..50f3982f21 100644
--- a/src/Gui/DlgPreferencePackManagementImp.cpp
+++ b/src/Gui/DlgPreferencePackManagementImp.cpp
@@ -54,7 +54,7 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event)
// but can only disable individual installed packs (though we can completely uninstall the pack's
// containing Addon by redirecting to the Addon Manager).
auto savedPreferencePacksDirectory = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
- auto modDirectory = fs::path(App::Application::getUserAppDataDir()) / "Mod";
+ auto modDirectories = Application::Instance->prefPackManager()->modPaths();
auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks";
// The displayed tree has two levels: at the toplevel is either "User-Saved Packs" or the name
@@ -66,12 +66,14 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event)
auto builtinPacks = getPacksFromDirectory(resourcePath);
std::map<std::string, std::vector<std::string>> installedPacks;
- if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) {
- for (const auto& mod : fs::directory_iterator(modDirectory)) {
- auto packs = getPacksFromDirectory(mod);
- if (!packs.empty()) {
- auto modName = mod.path().filename().string();
- installedPacks.emplace(modName, packs);
+ for (const auto& modDirectory : modDirectories) {
+ if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) {
+ for (const auto& mod : fs::directory_iterator(modDirectory)) {
+ auto packs = getPacksFromDirectory(mod);
+ if (!packs.empty()) {
+ auto modName = mod.path().filename().string();
+ installedPacks.emplace(modName, packs);
+ }
}
}
}
diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp
index dfc54240c0..83e32fa05e 100644
--- a/src/Gui/PreferencePackManager.cpp
+++ b/src/Gui/PreferencePackManager.cpp
@@ -30,6 +30,7 @@
#endif
#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
#include <QDir>
#include "PreferencePackManager.h"
@@ -134,12 +135,11 @@ void PreferencePack::applyConfigChanges() const
}
PreferencePackManager::PreferencePackManager()
+ : _preferencePackPaths(modPaths())
{
- auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
auto savedPath = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks";
- _preferencePackPaths.push_back(resourcePath);
- _preferencePackPaths.push_back(modPath);
+ _preferencePackPaths.insert(_preferencePackPaths.begin(), resourcePath);
_preferencePackPaths.push_back(savedPath);
rescan();
@@ -232,6 +232,26 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName,
rescan();
}
+// TODO(Shvedov): Is this suitable place for this method? It is more generic,
+// and maybe more suitable place at Application?
+std::vector<boost::filesystem::path> Gui::PreferencePackManager::modPaths() const
+{
+ auto userModPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
+
+ auto& config = App::Application::Config();
+ auto additionalModules = config.find("AdditionalModulePaths");
+ std::vector<boost::filesystem::path> result;
+
+ if (additionalModules != config.end()) {
+ boost::split(result,
+ additionalModules->second,
+ boost::is_any_of(";"),
+ boost::token_compress_on);
+ }
+ result.emplace_back(userModPath);
+ return result;
+}
+
void Gui::PreferencePackManager::FindPreferencePacksInPackage(const fs::path &mod)
{
try {
@@ -528,7 +548,6 @@ std::vector<PreferencePackManager::TemplateFile> PreferencePackManager::template
// (alternate spellings are provided for packages using CamelCase and snake_case, and both major English dialects)
auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui";
- auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
std::string group = "Built-In";
if (fs::exists(resourcePath) && fs::is_directory(resourcePath)) {
@@ -536,11 +555,13 @@ std::vector<PreferencePackManager::TemplateFile> PreferencePackManager::template
std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
}
- if (fs::exists(modPath) && fs::is_directory(modPath)) {
- for (const auto& mod : fs::directory_iterator(modPath)) {
- group = mod.path().filename().string();
- const auto localFiles = scanForTemplateFiles(group, mod);
- std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
+ for (const auto& modPath : modPaths()) {
+ if (fs::exists(modPath) && fs::is_directory(modPath)) {
+ for (const auto& mod : fs::directory_iterator(modPath)) {
+ group = mod.path().filename().string();
+ const auto localFiles = scanForTemplateFiles(group, mod);
+ std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
+ }
}
}
diff --git a/src/Gui/PreferencePackManager.h b/src/Gui/PreferencePackManager.h
index 301e160df2..e5776e47a0 100644
--- a/src/Gui/PreferencePackManager.h
+++ b/src/Gui/PreferencePackManager.h
@@ -191,6 +191,11 @@ namespace Gui {
*/
void importConfig(const std::string &packName, const boost::filesystem::path &path);
+ /**
+ * Get a list of all mod directories.
+ */
+ std::vector<boost::filesystem::path> modPaths() const;
+
private:
void FindPreferencePacksInPackage(const boost::filesystem::path& mod);
--
2.44.1
pkgs/by-name/fr/freecad/package.nix
+24 -9
View File
@@ -6,11 +6,11 @@
doxygen,
eigen,
fetchFromGitHub,
fetchpatch,
fmt,
gfortran,
gts,
hdf5,
libf2c,
libGLU,
libredwg,
libsForQt5,
@@ -37,6 +37,7 @@
qtVersion ? 5,
qt5,
qt6,
nix-update-script,
}:
let
inherit (python311Packages)
@@ -64,13 +65,13 @@ in
freecad-utils.makeCustomizable (
stdenv.mkDerivation (finalAttrs: {
pname = "freecad";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
rev = finalAttrs.version;
hash = "sha256-u7RYSImUMAgKaAQSAGCFha++RufpZ/QuHAirbSFOUCI=";
hash = "sha256-VFTNawXxu2ofjj2Frg4OfVhiMKFywBhm7lZunP85ZEQ=";
fetchSubmodules = true;
};
@@ -80,6 +81,8 @@ freecad-utils.makeCustomizable (
ninja
pkg-config
gfortran
swig
doxygen
wrapGAppsHook3
]
++ lib.optionals (qtVersion == 5) [
@@ -92,7 +95,6 @@ freecad-utils.makeCustomizable (
[
boost
coin3d
doxygen
eigen
fmt
gitpython # for addon manager
@@ -100,7 +102,6 @@ freecad-utils.makeCustomizable (
hdf5
libGLU
libXmu
libf2c
matplotlib
medfile
mpi
@@ -114,7 +115,6 @@ freecad-utils.makeCustomizable (
python
pyyaml # (at least for) PyrateWorkbench
scipy
swig
vtk
xercesc
yaml-cpp
@@ -152,7 +152,10 @@ freecad-utils.makeCustomizable (
patches = [
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
./0002-FreeCad-OndselSolver-pkgconfig.patch
./0003-Gui-take-in-account-module-path-argument.patch
(fetchpatch {
url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1";
hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";
})
];
cmakeFlags =
@@ -206,11 +209,20 @@ freecad-utils.makeCustomizable (
postFixup = ''
mv $out/share/doc $out
ln -s $out/doc $out/share/doc
ln -s $out/bin/FreeCAD $out/bin/freecad
ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
'';
passthru.tests = callPackage ./tests { };
passthru = {
tests = callPackage ./tests { };
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"([0-9.]+)"
];
};
};
meta = {
homepage = "https://www.freecad.org";
@@ -232,7 +244,10 @@ freecad-utils.makeCustomizable (
right at home with FreeCAD.
'';
license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ srounce ];
maintainers = with lib.maintainers; [
srounce
grimmauld
];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/gi/git-cola/package.nix
+17 -1
View File
@@ -7,6 +7,8 @@
git,
qt5,
versionCheckHook,
copyDesktopItems,
imagemagick,
nix-update-script,
}:
@@ -38,7 +40,8 @@ python3Packages.buildPythonApplication rec {
gettext
qt5.wrapQtAppsHook
python3Packages.setuptools-scm
];
imagemagick
] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
nativeCheckInputs = [
git
@@ -57,6 +60,19 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
desktopItems = [
"share/applications/git-cola-folder-handler.desktop"
"share/applications/git-cola.desktop"
"share/applications/git-dag.desktop"
];
postInstall = ''
for i in 16 24 48 64 96 128 256 512; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
magick cola/icons/git-cola.svg -background none -resize ''${i}x''${i} $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
done
'';
passthru.updateScript = nix-update-script { };
meta = {
pkgs/by-name/me/mealie/package.nix
+1 -1
View File
@@ -109,7 +109,7 @@ pythonpkgs.buildPythonApplication rec {
# Needed for tests
preCheck = ''
export NLTK_DATA=${nltk-data.averaged_perceptron_tagger_eng}
export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng}
'';
disabledTestPaths = [
pkgs/by-name/me/media-downloader/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "media-downloader";
version = "5.3.2";
version = "5.3.3";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "media-downloader";
rev = finalAttrs.version;
hash = "sha256-rNcEPE1BoCltpV5A3ugc7NI2ASfLXuPC9NNbc4Gn8BA=";
hash = "sha256-vVTTICGtuSUWz10iEEsMUSLwlZmOjW+ffpZ3T7Hy+WU=";
};
nativeBuildInputs = [
pkgs/by-name/ne/neo4j/package.nix
+3
View File
@@ -7,6 +7,7 @@
openjdk17,
which,
gawk,
bashNonInteractive,
}:
stdenv.mkDerivation rec {
@@ -19,6 +20,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bashNonInteractive ];
strictDeps = true;
installPhase = ''
mkdir -p "$out/share/neo4j"
pkgs/by-name/nf/nfpm/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "nfpm";
version = "2.42.0";
version = "2.42.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
hash = "sha256-63vhxsoGK8YNs0wobFyViOHO9K3hSHgWJU/wbvUxJFw=";
hash = "sha256-uHtrxBlSlVBmpVqE645nRNQ3mL07Uj9YrmG/jAfuyyg=";
};
vendorHash = "sha256-VA6/n89OIX+Au1JmCwWezh80xEtydUgBWYSlwpyXZtA=";
vendorHash = "sha256-pxOxiYYvzIAmXo4rRLpngG4ILUhc1f1DJqwNxXlCXtM=";
ldflags = [
"-s"
pkgs/by-name/pa/paperless-ngx/package.nix
+2 -2
View File
@@ -313,8 +313,8 @@ python.pkgs.buildPythonApplication rec {
tesseract5
;
nltkData = with nltk-data; [
punkt_tab
snowball_data
punkt-tab
snowball-data
stopwords
];
tests = { inherit (nixosTests) paperless; };
pkgs/by-name/qm/qmmp/package.nix
+2 -2
View File
@@ -54,11 +54,11 @@
stdenv.mkDerivation rec {
pname = "qmmp";
version = "2.2.5";
version = "2.2.6";
src = fetchurl {
url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";
hash = "sha256-WCEfMnrDhau8fXXmpdjdZLzbXMDxEZMp8pJ9FjEJfhg=";
hash = "sha256-Jw7Kb9co2aC8fxnpTg4OH2o8RNreZI3/pYoNu3OWy0s=";
};
nativeBuildInputs = [
pkgs/by-name/rc/rcp/package.nix
+3 -3
View File
@@ -7,17 +7,17 @@
rustPlatform.buildRustPackage rec {
pname = "rcp";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "wykurz";
repo = "rcp";
rev = "v${version}";
hash = "sha256-mMSO5twpuxiA6pMG/bNMn3WJjs3ZwuoOk62M0WIrRBk=";
hash = "sha256-mFFMxGu/r8xtfMkpDW2Rk/oTWQcS9oK6ngoRKCc+STo=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-uVBWPxGxNgiahywA78QjN8msNx3gZ6vOyX7AkOdK2EM=";
cargoHash = "sha256-2S3bygSu9ouT/RYCmafFGvFHHFJXVryb5E3PMmcZs0U=";
RUSTFLAGS = "--cfg tokio_unstable";
pkgs/by-name/sb/sbarlua/package.nix
+32
View File
@@ -0,0 +1,32 @@
{
lib,
fetchFromGitHub,
gcc,
lua54Packages,
readline,
}:
lua54Packages.buildLuaPackage {
pname = "sbarLua";
version = "0-unstable-2024-08-12";
src = fetchFromGitHub {
owner = "FelixKratz";
repo = "SbarLua";
rev = "437bd2031da38ccda75827cb7548e7baa4aa9978";
hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg=";
};
nativeBuildInputs = [ gcc ];
buildInputs = [ readline ];
makeFlags = [ "INSTALL_DIR=$(out)/lib/lua/${lua54Packages.lua.luaversion}" ];
meta = {
description = "Lua API for SketchyBar";
homepage = "https://github.com/FelixKratz/SbarLua/";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.khaneliman ];
platforms = lib.platforms.darwin;
};
}
pkgs/by-name/sc/sc-im/package.nix
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "sc-im";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "andmarti1424";
repo = "sc-im";
rev = "v${version}";
sha256 = "sha256-nNOifSYbmJjuw6c8TerIQRlhCwbs7GnzD2J7O3vs0gI=";
sha256 = "sha256-V2XwzZwn+plMxQuTCYxbeTaqdud69z77oMDDDi+7Jw0=";
};
sourceRoot = "${src.name}/src";
pkgs/by-name/un/unstructured-api/package.nix
+1 -1
View File
@@ -152,7 +152,7 @@ let
paths = [
nltk-data.punkt
nltk-data.averaged_perceptron_tagger
nltk-data.averaged-perceptron-tagger
];
};
in
pkgs/by-name/vp/vpl-gpu-rt/package.nix
+2 -2
View File
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "vpl-gpu-rt";
version = "25.2.1";
version = "25.2.2";
outputs = [
"out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "vpl-gpu-rt";
rev = "intel-onevpl-${version}";
hash = "sha256-K6w5A0LbQDTKM5y5AzZ/Hr/FwQLZqHov0tiJHbzUE4w=";
hash = "sha256-RUzDNJ22oJhOKM0q+wzMpNmqtNGxNsVai0Homj5XuBs=";
};
nativeBuildInputs = [
pkgs/development/python-modules/aider-chat/default.nix
+1 -1
View File
@@ -125,7 +125,7 @@ let
aider-nltk-data = symlinkJoin {
name = "aider-nltk-data";
paths = [
nltk-data.punkt_tab
nltk-data.punkt-tab
nltk-data.stopwords
];
};
pkgs/development/python-modules/ingredient-parser-nlp/default.nix
+1 -1
View File
@@ -44,7 +44,7 @@ buildPythonPackage rec {
# Needed for tests
preCheck = ''
export NLTK_DATA=${nltk-data.averaged_perceptron_tagger_eng}
export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng}
'';
meta = {
pkgs/development/python-modules/type-infer/default.nix
+1 -1
View File
@@ -24,7 +24,7 @@ let
name = "nltk-test-data";
paths = [
nltk-data.punkt
nltk-data.punkt_tab
nltk-data.punkt-tab
nltk-data.stopwords
];
};
pkgs/tools/package-management/nix/default.nix
+3 -3
View File
@@ -187,14 +187,14 @@ lib.makeExtensible (
};
nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
version = "2.29pre20250409_${lib.substring 0 8 src.rev}";
version = "2.30pre20250521_${lib.substring 0 8 src.rev}";
inherit (self.nix_2_24.meta) maintainers teams;
otherSplices = generateSplicesForNixComponents "nixComponents_git";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "e76bbe413e86e3208bb9824e339d59af25327101";
hash = "sha256-Aqnj5+sA7B4ZRympuyfWPPK83iomKHEHMYhlwslI8iA=";
rev = "76a4d4c2913a1654dddd195b034ff7e66cb3e96f";
hash = "sha256-OA22Ig72oV6reHN8HMlimmnrsxpNzqyzi4h6YBVzzEA=";
};
};
pkgs/tools/package-management/nix/dependencies.nix
+1
View File
@@ -72,6 +72,7 @@ regular@{
aws-sdk-cpp =
(regular.aws-sdk-cpp.override {
apis = [
"identity-management"
"s3"
"transfer"
];
pkgs/tools/text/nltk-data/default.nix
+211 -36
View File
@@ -10,12 +10,16 @@ let
version = "0-unstable-2024-07-29";
nativeBuildInputs = [ unzip ];
dontBuild = true;
dontFixup = true;
meta = with lib; {
description = "NLTK Data";
homepage = "https://github.com/nltk/nltk_data";
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ happysalada ];
maintainers = with maintainers; [
bengsparks
happysalada
];
};
};
makeNltkDataPackage =
@@ -50,41 +54,212 @@ let
'';
}
);
makeChunker =
pname:
makeNltkDataPackage {
inherit pname;
location = "chunkers";
hash = "sha256-kemjqaCM9hlKAdMw8oVJnp62EAC9rMQ50dKg7wlAwEc=";
};
makeCorpus =
pname:
makeNltkDataPackage {
inherit pname;
location = "corpora";
hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
};
makeGrammar =
pname:
makeNltkDataPackage {
inherit pname;
location = "grammars";
hash = "sha256-pyLEcX3Azv8j1kCGvVYonuiNgVJxtWt7veU0S/yNbIM=";
};
makeHelp =
pname:
makeNltkDataPackage {
inherit pname;
location = "help";
hash = "sha256-97mYLNES5WujLF5gD8Ul4cJ6LqSzz+jDzclUsdBeHNE=";
};
makeMisc =
pname:
makeNltkDataPackage {
inherit pname;
location = "misc";
hash = "sha256-XtizfEsc8TYWqvvC/eSFdha2ClC5/ZiJM8nue0vXLb4=";
};
makeModel =
pname:
makeNltkDataPackage {
inherit pname;
location = "models";
hash = "sha256-iq3weEgCci6rgLW2j28F2eRLprJtInGXKe/awJPSVG4=";
};
makeTagger =
pname:
makeNltkDataPackage {
inherit pname;
location = "taggers";
hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
};
makeTokenizer =
pname:
makeNltkDataPackage {
inherit pname;
location = "tokenizers";
hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
};
makeStemmer =
pname:
makeNltkDataPackage {
inherit pname;
location = "stemmers";
hash = "sha256-mNefwOPVJGz9kXV3LV4DuV7FJpNir/Nwg4ujd0CogEk=";
};
in
lib.makeScope newScope (self: {
punkt = makeNltkDataPackage {
pname = "punkt";
location = "tokenizers";
hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
};
punkt_tab = makeNltkDataPackage {
pname = "punkt_tab";
location = "tokenizers";
hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
};
averaged_perceptron_tagger = makeNltkDataPackage {
pname = "averaged_perceptron_tagger";
location = "taggers";
hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
};
averaged_perceptron_tagger_eng = makeNltkDataPackage {
pname = "averaged_perceptron_tagger_eng";
location = "taggers";
hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
};
snowball_data = makeNltkDataPackage {
pname = "snowball_data";
location = "stemmers";
hash = "sha256-mNefwOPVJGz9kXV3LV4DuV7FJpNir/Nwg4ujd0CogEk=";
};
stopwords = makeNltkDataPackage {
pname = "stopwords";
location = "corpora";
hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
};
wordnet = makeNltkDataPackage {
pname = "wordnet";
location = "corpora";
hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
};
## Chunkers
maxent-ne-chunker = makeChunker "maxent_ne_chunker";
maxent-ne-chunker-tab = makeChunker "maxent_ne_chunker_tab";
## Corpora
abc = makeCorpus "abc";
alpino = makeCorpus "alpino";
bcp47 = makeCorpus "bcp47";
biocreative-ppi = makeCorpus "biocreative_ppi";
brown = makeCorpus "brown";
brown-tei = makeCorpus "brown_tei";
cess-cat = makeCorpus "cess_cat";
cess-esp = makeCorpus "cess_esp";
chat80 = makeCorpus "chat80";
city-database = makeCorpus "city_database";
cmudict = makeCorpus "cmudict";
comparative-sentences = makeCorpus "comparative_sentences";
comtrans = makeCorpus "comtrans";
conll2000 = makeCorpus "conll2000";
conll2002 = makeCorpus "conll2002";
conll2007 = makeCorpus "conll2007";
crubadan = makeCorpus "crubadan";
dependency-treebank = makeCorpus "dependency_treebank";
dolch = makeCorpus "dolch";
europarl-raw = makeCorpus "europarl_raw";
extended-omw = makeCorpus "extended_omw";
floresta = makeCorpus "floresta";
framenet-v15 = makeCorpus "framenet_v15";
framenet-v17 = makeCorpus "framenet_v17";
gazetteers = makeCorpus "gazetteers";
genesis = makeCorpus "genesis";
gutenberg = makeCorpus "gutenberg";
ieer = makeCorpus "ieer";
inaugural = makeCorpus "inaugural";
indian = makeCorpus "indian";
jeita = makeCorpus "jeita";
kimmo = makeCorpus "kimmo";
knbc = makeCorpus "knbc";
lin-thesaurus = makeCorpus "lin_thesaurus";
mac-morpho = makeCorpus "mac_morpho";
machado = makeCorpus "machado";
masc-tagged = makeCorpus "masc_tagged";
movie-reviews = makeCorpus "movie_reviews";
mte-teip5 = makeCorpus "mte_teip5";
names = makeCorpus "names";
nombank-1-0 = makeCorpus "nombank.1.0";
nonbreaking-prefixes = makeCorpus "nonbreaking_prefixes";
nps-chat = makeCorpus "nps_chat";
omw = makeCorpus "omw";
omw-1-4 = makeCorpus "omw-1.4";
opinion-lexicon = makeCorpus "opinion_lexicon";
panlex-swadesh = makeCorpus "panlex_swadesh";
paradigms = makeCorpus "paradigms";
pe08 = makeCorpus "pe08";
pil = makeCorpus "pil";
pl196x = makeCorpus "pl196x";
ppattach = makeCorpus "ppattach";
problem-reports = makeCorpus "problem_reports";
product-reviews-1 = makeCorpus "product_reviews_1";
product-reviews-2 = makeCorpus "product_reviews_2";
propbank = makeCorpus "propbank";
pros-cons = makeCorpus "pros_cons";
ptb = makeCorpus "ptb";
qc = makeCorpus "qc";
reuters = makeCorpus "reuters";
rte = makeCorpus "rte";
semcor = makeCorpus "semcor";
senseval = makeCorpus "senseval";
sentence-polarity = makeCorpus "sentence_polarity";
sentiwordnet = makeCorpus "sentiwordnet";
shakespeare = makeCorpus "shakespeare";
sinica-treebank = makeCorpus "sinica_treebank";
smultron = makeCorpus "smultron";
state-union = makeCorpus "state_union";
stopwords = makeCorpus "stopwords";
subjectivity = makeCorpus "subjectivity";
swadesh = makeCorpus "swadesh";
switchboard = makeCorpus "switchboard";
timit = makeCorpus "timit";
toolbox = makeCorpus "toolbox";
treebank = makeCorpus "treebank";
twitter-samples = makeCorpus "twitter_samples";
udhr = makeCorpus "udhr";
udhr2 = makeCorpus "udhr2";
unicode-samples = makeCorpus "unicode_samples";
universal-treebanks-v20 = makeCorpus "universal_treebanks_v20";
verbnet = makeCorpus "verbnet";
verbnet3 = makeCorpus "verbnet3";
webtext = makeCorpus "webtext";
wordnet = makeCorpus "wordnet";
wordnet-ic = makeCorpus "wordnet_ic";
wordnet2021 = makeCorpus "wordnet2021";
wordnet2022 = makeCorpus "wordnet2022";
wordnet31 = makeCorpus "wordnet31";
words = makeCorpus "words";
ycoe = makeCorpus "ycoe";
## Grammars
basque-grammars = makeGrammar "basque_grammars";
book-grammars = makeGrammar "book_grammars";
large-grammars = makeGrammar "large_grammars";
sample-grammars = makeGrammar "sample_grammars";
spanish-grammars = makeGrammar "spanish_grammars";
## Help
tagsets-json = makeHelp "tagsets_json";
## Misc
mwa-ppdb = makeMisc "mwa_ppdb";
perluniprops = makeMisc "perluniprops";
## Models
bllip-wsj-no-aux = makeModel "bllip_wsj_no_aux";
moses-sample = makeModel "moses_sample";
wmt15-eval = makeModel "wmt15_eval";
word2vec-sample = makeModel "word2vec_sample";
## Taggers
averaged-perceptron-tagger = makeTagger "averaged_perceptron_tagger";
averaged-perceptron-tagger-eng = makeTagger "averaged_perceptron_tagger_eng";
averaged-perceptron-tagger-ru = makeTagger "averaged_perceptron_tagger_ru";
averaged-perceptron-tagger-rus = makeTagger "averaged_perceptron_tagger_rus";
maxent-treebank-pos-tagger = makeTagger "maxent_treebank_pos_tagger";
maxent-treebank-pos-tagger-tab = makeTagger "maxent_treebank_pos_tagger_tab";
universal-tagset = makeTagger "universal_tagset";
## Tokenizers
punkt = makeTokenizer "punkt";
punkt-tab = makeTokenizer "punkt_tab";
## Stemmers
porter-test = makeStemmer "porter_test";
rslp = makeStemmer "rslp";
snowball-data = makeStemmer "snowball_data";
})
pkgs/top-level/aliases.nix
+4
View File
@@ -1353,6 +1353,10 @@ mapAliases {
# When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable.
nixosTest = testers.nixosTest; # Added 2022-05-05
nltk-data.averaged_perceptron_tagger = nltk-data.averaged-perceptron-tagger; # Added 2025-05-21
nltk-data.averaged_perceptron_tagger_eng = nltk-data.averaged-perceptron-tagger-eng; # Added 2025-05-21
nltk-data.punkt_tab = nltk-data.punkt-tab; # Added 2025-05-21
nltk-data.snowball_data = nltk-data.snowball-data; # Added 2025-05-21
nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10
nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -2344,7 +2344,7 @@ with pkgs;
mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };
nltk-data = callPackage ../tools/text/nltk-data { };
nltk-data = lib.recurseIntoAttrs (callPackage ../tools/text/nltk-data { });
seabios-coreboot = seabios.override { ___build-type = "coreboot"; };
seabios-csm = seabios.override { ___build-type = "csm"; };