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-08-15 06:06:29 +00:00
committed by GitHub
parent c0e9e1afcf 13c53b2f62
commit 2c009120f7
30 changed files with 237 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/desktop-managers/lomiri.nix
+4 -10
View File
@@ -148,11 +148,11 @@ in
lomiri-download-manager
];
# Copy-pasted basic stuff
hardware.graphics.enable = lib.mkDefault true;
fonts.enableDefaultPackages = lib.mkDefault true;
services.accounts-daemon.enable = true;
services.udisks2.enable = true;
services.upower.enable = true;
services.geoclue2.enable = true;
services.telepathy.enable = true;
services.ayatana-indicators = {
enable = true;
@@ -176,10 +176,6 @@ in
);
};
services.udisks2.enable = true;
services.upower.enable = true;
services.geoclue2.enable = true;
services.gnome.evolution-data-server = {
enable = true;
plugins = with pkgs; [
@@ -187,8 +183,6 @@ in
];
};
services.telepathy.enable = true;
services.displayManager = {
defaultSession = lib.mkDefault "lomiri";
sessionPackages = with pkgs.lomiri; [ lomiri-session ];
pkgs/applications/editors/emacs/sources.nix
+3 -13
View File
@@ -105,25 +105,15 @@ in
{
emacs30 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "30.1";
version = "30.2";
variant = "mainline";
rev = "30.1";
hash = "sha256-wBuWLuFzwB77FqAYAUuNe3CuJFutjqp0XGt5srt7jAo=";
rev = "30.2";
hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA=";
patches = fetchpatch: [
(builtins.path {
name = "inhibit-lexical-cookie-warning-67916.patch";
path = ./inhibit-lexical-cookie-warning-67916-30.patch;
})
(fetchpatch {
# bug#63288 and bug#76523
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=53a5dada413662389a17c551a00d215e51f5049f";
hash = "sha256-AEvsQfpdR18z6VroJkWoC3sBoApIYQQgeF/P2DprPQ8=";
})
(fetchpatch {
# bug#76573
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=05ecb2b8f0216aa3f391ee661aad4d61fd6aed0e";
hash = "sha256-fvnHMvuqwQseVrDpVpnzSaoWfXrR5tsjIib7+lhRGII=";
})
];
});
pkgs/applications/editors/vscode/vscode.nix
+6 -6
View File
@@ -36,17 +36,17 @@ let
hash =
{
x86_64-linux = "sha256-Fji3/9T8X2VQH6gUhReSuniuX2BX+4S7uPJWEZn56vc=";
x86_64-darwin = "sha256-LgYdgiZbMdpe/KjAYuAVYEFFc1gcFSo5+/6lf15zUvk=";
aarch64-linux = "sha256-WxJEjTvXK1N1FjEFv0nUX7oLgPrcKlPHYSiLkTcdhj4=";
aarch64-darwin = "sha256-2H44MkP7Vv+j78DxGWROHCPdMQv2WzTrG1I7LANMYqg=";
armv7l-linux = "sha256-Pw9krAFjrllNOsXipaZy7X7wnB7C8V45WU7HuKa59JQ=";
x86_64-linux = "sha256-0zM9dyK226l4RgF1H81ojp5HC25snaN5K1QCnWIw/nw=";
x86_64-darwin = "sha256-PpThKF6TKp7hcku8QEsVYhQYVwgiVFaCWSgNI6Vo2+s=";
aarch64-linux = "sha256-bv9WsrvvlUc4PCKNZmsFBXQD6le5Ier1nm5qaXD2Mic=";
aarch64-darwin = "sha256-5wWmlgarDlWvk2Y4HRk00/oi0WcjDmnT7YL2Z1rfJ+Y=";
armv7l-linux = "sha256-hSYqK1hXg3nfxz344XdLrnWfixmlqbJUpI68PCcfF+I=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.103.0";
version = "1.103.1";
# This is used for VS Code - Remote SSH test
rev = "e3550cfac4b63ca4eafca7b601f0d2885817fd1f";
pkgs/applications/office/ktimetracker/default.nix
-61
View File
@@ -1,61 +0,0 @@
{
mkDerivation,
lib,
fetchurl,
cmake,
pkg-config,
extra-cmake-modules,
kconfig,
kconfigwidgets,
kdbusaddons,
kdoctools,
ki18n,
kidletime,
kjobwidgets,
kio,
knotifications,
kwindowsystem,
kxmlgui,
ktextwidgets,
kcalendarcore,
}:
mkDerivation rec {
pname = "ktimetracker";
version = "5.0.1";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0jp63fby052rapjjaz413b1wjz4qsgpxh82y2d75jzimch0n5s02";
};
nativeBuildInputs = [
cmake
pkg-config
extra-cmake-modules
];
buildInputs = [
kconfig
kconfigwidgets
kdbusaddons
kdoctools
ki18n
kidletime
kjobwidgets
kio
knotifications
kwindowsystem
kxmlgui
ktextwidgets
kcalendarcore
];
meta = with lib; {
description = "Todo management and time tracking application";
mainProgram = "ktimetracker";
license = licenses.gpl2;
homepage = "https://userbase.kde.org/KTimeTracker";
maintainers = [ ];
};
}
pkgs/applications/window-managers/jwm/default.nix
+4
View File
@@ -66,6 +66,10 @@ stdenv.mkDerivation rec {
xorgproto
];
postPatch = ''
sed -i '/AM_ICONV/i AC_CONFIG_MACRO_DIRS([m4])' configure.ac
'';
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
enableParallelBuilding = true;
pkgs/development/tools/analysis/brakeman/Gemfile → pkgs/by-name/br/brakeman/Gemfile
View File
pkgs/development/tools/analysis/brakeman/Gemfile.lock → pkgs/by-name/br/brakeman/Gemfile.lock
+3 -3
View File
@@ -1,9 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
brakeman (6.1.2)
brakeman (7.1.0)
racc
racc (1.7.3)
racc (1.8.1)
PLATFORMS
ruby
@@ -12,4 +12,4 @@ DEPENDENCIES
brakeman
BUNDLED WITH
2.5.5
2.6.9
pkgs/development/tools/analysis/brakeman/gemset.nix → pkgs/by-name/br/brakeman/gemset.nix
+4 -4
View File
@@ -5,19 +5,19 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1lylig4vgnw9l1ybwgxdi9nw9q2bc5dcplklg8nsbi7j32f7c5kp";
sha256 = "1bs8bm3qj2wfy5h1bp8qi1d3vjw5zabhnq5rr288802kbakhiixv";
type = "gem";
};
version = "6.1.2";
version = "7.1.0";
};
racc = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
version = "1.7.3";
version = "1.8.1";
};
}
pkgs/development/tools/analysis/brakeman/default.nix → pkgs/by-name/br/brakeman/package.nix
+6 -2
View File
@@ -5,6 +5,10 @@
bundlerUpdateScript,
}:
let
gems = import ./gemset.nix;
version = gems.brakeman.version;
in
bundlerApp {
pname = "brakeman";
exes = [ "brakeman" ];
@@ -12,11 +16,11 @@ bundlerApp {
passthru.updateScript = bundlerUpdateScript "brakeman";
meta = with lib; {
meta = {
description = "Static analysis security scanner for Ruby on Rails";
homepage = "https://brakemanscanner.org/";
changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md";
license = [ licenses.unfreeRedistributable ];
license = lib.licenses.unfreeRedistributable;
platforms = ruby.meta.platforms;
maintainers = [ ];
mainProgram = "brakeman";
pkgs/by-name/cl/clash-rs/package.nix
+11 -3
View File
@@ -4,24 +4,32 @@
rustPlatform,
protobuf,
versionCheckHook,
cmake,
pkg-config,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "clash-rs";
version = "0.7.7";
version = "0.8.2";
src = fetchFromGitHub {
owner = "Watfaq";
repo = "clash-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-x89sFBQ6bAIHvaRTCxqKKgFKo7PpquVze0R6VicwrJw=";
hash = "sha256-HkIsflsLTQdvetgamLt6LbYxOpv1+FQ/e/PzJjKOfq4=";
};
cargoHash = "sha256-jfc0Rmt9eEN3ds5Rakj+IcJcUa28CbhiSu4AfqHurf0=";
cargoHash = "sha256-Qh/YxNO/DtVBj6Eiloc3+Fs+dQqvAXSe+5lCer0F2zs=";
patches = [
./unbounded-shifts.patch
];
nativeBuildInputs = [
cmake
pkg-config
rustPlatform.bindgenHook
];
nativeInstallCheckInputs = [
protobuf
versionCheckHook
pkgs/by-name/cl/clash-rs/unbounded-shifts.patch
+7 -9
View File
@@ -1,13 +1,11 @@
diff --git a/clash_lib/src/lib.rs b/clash_lib/src/lib.rs
index 6ada034..420e465 100644
--- a/clash_lib/src/lib.rs
+++ b/clash_lib/src/lib.rs
@@ -2,7 +2,7 @@
#![feature(ip)]
#![feature(sync_unsafe_cell)]
--- a/clash-lib/src/lib.rs
+++ b/clash-lib/src/lib.rs
@@ -4,7 +4,7 @@
#![feature(let_chains)]
-#![cfg_attr(not(version("1.86.0")), feature(unbounded_shifts))]
#![feature(lazy_get)]
#![feature(duration_millis_float)]
-#![cfg_attr(not(version("1.87.0")), feature(unbounded_shifts))]
+#![feature(unbounded_shifts)]
#[macro_use]
extern crate anyhow;
pkgs/by-name/cp/cpp-utilities/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cpp-utilities";
version = "5.29.0";
version = "5.30.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = "cpp-utilities";
rev = "v${finalAttrs.version}";
sha256 = "sha256-EtKcvkNpqEzpJj+hTJsQaDQad4SO0h1TLUbJ8leNTdk=";
sha256 = "sha256-cBr9Vw0UnC2+x/VSvL8u5hsvgk5RdY/3/KCUFQy24rg=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/kt/ktimetracker/package.nix
+56
View File
@@ -0,0 +1,56 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
pkg-config,
kdePackages,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ktimetracker";
version = "6.0.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "ktimetracker";
tag = "v${finalAttrs.version}";
hash = "sha256-SQjqNzmmt0AEQvGW4Vz5GldQcp7Q9rZvGG7mGugRwd8=";
};
nativeBuildInputs = [
cmake
pkg-config
]
++ (with kdePackages; [
extra-cmake-modules
wrapQtAppsHook
]);
buildInputs = with kdePackages; [
kconfig
kconfigwidgets
kdbusaddons
kdoctools
ki18n
kidletime
kjobwidgets
kio
knotifications
kwindowsystem
kxmlgui
ktextwidgets
kcalendarcore
qt5compat
kstatusnotifieritem
kcmutils
];
meta = {
description = "Todo management and time tracking application";
mainProgram = "ktimetracker";
license = lib.licenses.gpl2;
homepage = "https://userbase.kde.org/KTimeTracker";
maintainers = with lib.maintainers; [ ];
};
})
pkgs/by-name/lm/lmstudio/package.nix
+4 -4
View File
@@ -7,10 +7,10 @@
let
pname = "lmstudio";
version_aarch64-darwin = "0.3.22-1";
hash_aarch64-darwin = "sha256-rmIZ+NIfryZUc1nZZD36oxICGjBReO4SMCCOr9p5ID8=";
version_x86_64-linux = "0.3.22-1";
hash_x86_64-linux = "sha256-oqukPQ0kSiBpDIePwSKTC4gpbFmGZ+CaNf7p8z65xAE=";
version_aarch64-darwin = "0.3.23-3";
hash_aarch64-darwin = "sha256-Jfx4Fx9mlrdGckE2ML3eTQHfgglEELOYJYxibRiAB7c=";
version_x86_64-linux = "0.3.23-3";
hash_x86_64-linux = "sha256-FG3CzD6UjuPYXImjTkKTozpTQVGk8JLqxhJxTS9qjuo=";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
pkgs/by-name/mu/multipass/gui.nix
+2 -2
View File
@@ -5,7 +5,7 @@
version,
autoPatchelfHook,
flutter,
flutter332,
gtkmm3,
keybinder3,
lib,
@@ -15,7 +15,7 @@
protoc-gen-dart,
qt6,
}:
flutter.buildFlutterApplication {
flutter332.buildFlutterApplication {
inherit version;
pname = "multipass-gui";
src = multipass_src;
pkgs/by-name/on/onedrivegui/package.nix
+21 -13
View File
@@ -8,10 +8,12 @@
makeDesktopItem,
makeWrapper,
onedrive,
nix-update-script,
}:
let
version = "1.1.1a";
version = "1.2.1";
setupPy = writeText "setup.py" ''
from setuptools import setup
@@ -28,15 +30,19 @@ in
python3Packages.buildPythonApplication rec {
pname = "onedrivegui";
inherit version;
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "bpozdena";
repo = "OneDriveGUI";
rev = "v${version}";
hash = "sha256-pcY1JOi74pePvkIMRuHv5mlE4F68NzuBLJTCtgjUFRw=";
tag = "v${version}";
hash = "sha256-QCSCJ1m/PKSpkfseq8fyDEHFyIt156Lp15JC04NY0ps=";
};
build-system = with python3Packages; [
setuptools
];
nativeBuildInputs = [
copyDesktopItems
qt6.wrapQtAppsHook
@@ -48,7 +54,7 @@ python3Packages.buildPythonApplication rec {
qt6.qtwayland
];
propagatedBuildInputs = with python3Packages; [
dependencies = with python3Packages; [
pyside6
requests
];
@@ -58,7 +64,7 @@ python3Packages.buildPythonApplication rec {
dontWrapQtApps = true;
doCheck = false; # No tests defined
pythonImportsCheck = [ "OneDriveGUI" ];
# pythonImportsCheck = [ "OneDriveGUI" ]; # requires a display
desktopItems = [
(makeDesktopItem {
@@ -74,8 +80,8 @@ python3Packages.buildPythonApplication rec {
];
postPatch = ''
# Patch OneDriveGUI.py so DIR_PATH points to shared files location
sed -i src/OneDriveGUI.py -e "s@^DIR_PATH =.*@DIR_PATH = '$out/share/OneDriveGUI'@"
# Patch global_config.py so DIR_PATH points to shared files location
sed -i src/global_config.py -e "s@^DIR_PATH =.*@DIR_PATH = '$out/share/OneDriveGUI'@"
cp ${setupPy} ${setupPy.name}
'';
@@ -91,17 +97,19 @@ python3Packages.buildPythonApplication rec {
''${qtWrapperArgs[@]} \
--prefix PATH : ${lib.makeBinPath [ onedrive ]} \
--prefix PYTHONPATH : ${
python3Packages.makePythonPath (propagatedBuildInputs ++ [ (placeholder "out") ])
python3Packages.makePythonPath (dependencies ++ [ (placeholder "out") ])
} \
--add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py
'';
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/bpozdena/OneDriveGUI";
description = "Simple GUI for Linux OneDrive Client, with multi-account support";
mainProgram = "onedrivegui";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ philipdb ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/qu/quickgui/package.nix
+2 -2
View File
@@ -3,10 +3,10 @@
makeDesktopItem,
copyDesktopItems,
lib,
flutter,
flutter332,
quickemu,
}:
flutter.buildFlutterApplication rec {
flutter332.buildFlutterApplication rec {
pname = "quickgui";
version = "1.2.10";
src = fetchFromGitHub {
pkgs/by-name/ru/ruffle/package.nix
+3 -3
View File
@@ -21,16 +21,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruffle";
version = "0-nightly-2025-08-05";
version = "0-nightly-2025-08-14";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = "ruffle";
tag = lib.strings.removePrefix "0-" finalAttrs.version;
hash = "sha256-1v/PnGYchauwSpYxP6mXNkkcK1bLF/u6VAYTPXk5bVc=";
hash = "sha256-+JdZoYderFUngMbFMNXw1pbW6qogb7vCeqdIHEzqMjQ=";
};
cargoHash = "sha256-xrlcn18ryK7PrR/KfBKN0ot+h06nj4cl2Gx4Dm1RyqU=";
cargoHash = "sha256-P+uFE92ZWa491snEanzB1T0OPPOOYZsy2RAmwtIIAdo=";
cargoBuildFlags = lib.optional withRuffleTools "--workspace";
env =
pkgs/applications/audio/squishyball/gnu-screen.patch → pkgs/by-name/sq/squishyball/gnu-screen.patch
View File
pkgs/applications/audio/squishyball/default.nix → pkgs/by-name/sq/squishyball/package.nix
+7 -7
View File
@@ -14,14 +14,14 @@
stdenv.mkDerivation {
pname = "squishyball";
version = "unstable-2020-11-23";
version = "unstable-2021-01-05";
src = fetchFromGitLab {
domain = "gitlab.xiph.org";
owner = "xiph";
repo = "squishyball";
rev = "27590fe6bac545e2dd3eacf048edbd969682263a";
sha256 = "07zs8wx1ahf3q505fk9b6cgzlkhnayfsscch46yy9s1wgxgphj7s";
rev = "d3525c015abf123d55a7a209a40976538be9d402";
hash = "sha256-2tzfTPwfC/FE+nsXIkIyHSKXNkGwVPfERkFW83py1Dk=";
};
nativeBuildInputs = [
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
cp squishyball.1 $out/share/man/man1
'';
meta = with lib; {
meta = {
description = "Tool to perform sample comparison testing on the command line";
longDescription = ''
squishyball is a simple command-line utility for performing
@@ -72,9 +72,9 @@ stdenv.mkDerivation {
mode of operation.
'';
homepage = "https://gitlab.xiph.org/xiph/squishyball";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ michalrus ];
platforms = platforms.linux;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ michalrus ];
platforms = lib.platforms.linux;
mainProgram = "squishyball";
};
}
pkgs/by-name/ta/tandoor-recipes/common.nix
+4 -4
View File
@@ -1,15 +1,15 @@
{ lib, fetchFromGitHub }:
rec {
version = "1.5.35";
version = "2.0.1";
src = fetchFromGitHub {
owner = "TandoorRecipes";
repo = "recipes";
rev = version;
hash = "sha256-pzujKBUNVILFrgsCWuYFvO48AYPbBpxS1im1dj7NpMw=";
tag = version;
hash = "sha256-tFnfuRYg9lq7hveGZqpRVHNaXxS6BUs88/BHnUXe4mA=";
};
yarnHash = "sha256-P8TqHa5t3oWEYUQDD7VrGTWHJ3y68OhQa3YzQpceJgw=";
yarnHash = "sha256-6+GmYibzujV1vE0FqMctGscRkrendpvczDdMK++qtTU=";
meta = {
homepage = "https://tandoor.dev/";
pkgs/by-name/ta/tandoor-recipes/frontend.nix
+5 -6
View File
@@ -9,14 +9,14 @@
let
common = callPackage ./common.nix { };
in
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "tandoor-recipes-frontend";
inherit (common) version;
src = "${common.src}/vue";
src = "${common.src}/vue3";
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${common.src}/vue/yarn.lock";
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = common.yarnHash;
};
@@ -50,8 +50,7 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
cp -R ../cookbook/static/vue/ $out
cp webpack-stats.json $out
cp -R ../cookbook/static/vue3/ $out
echo "${common.version}" > "$out/version"
runHook postInstall
@@ -60,4 +59,4 @@ stdenv.mkDerivation {
meta = common.meta // {
description = "Tandoor Recipes frontend";
};
}
})
pkgs/by-name/ta/tandoor-recipes/package.nix
+13 -5
View File
@@ -28,6 +28,10 @@ python.pkgs.buildPythonPackage {
fi
substituteInPlace pytest.ini --subst-var NIX_BUILD_CORES
# The script name test tries to use django allauth for admin login
substituteInPlace cookbook/admin.py \
--replace-fail "admin.site.login = secure_admin_login(admin.site.login)" ""
'';
propagatedBuildInputs = with python.pkgs; [
@@ -37,7 +41,10 @@ python.pkgs.buildPythonPackage {
django-cleanup
django-crispy-forms
django-tables2
django-vite
djangorestframework
drf-spectacular
drf-spectacular-sidecar
drf-writable-nested
django-oauth-toolkit
bleach
@@ -81,13 +88,16 @@ python.pkgs.buildPythonPackage {
python3-openid
python3-saml
standard-imghdr
# Tests
fido2
litellm
];
configurePhase = ''
runHook preConfigure
ln -sf ${frontend}/ cookbook/static/vue
cp ${frontend}/webpack-stats.json vue/
ln -sf ${frontend}/ cookbook/static/vue3
runHook postConfigure
'';
@@ -106,7 +116,6 @@ python.pkgs.buildPythonPackage {
touch cookbook/static/themes/bootstrap.min.css.map
touch cookbook/static/css/bootstrap-vue.min.css.map
${python.pythonOnBuildForHost.interpreter} manage.py collectstatic_js_reverse
${python.pythonOnBuildForHost.interpreter} manage.py collectstatic
runHook postBuild
@@ -121,8 +130,7 @@ python.pkgs.buildPythonPackage {
makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \
--prefix PYTHONPATH : "$PYTHONPATH"
# usually copied during frontend build (see vue.config.js)
cp vue/src/sw.js $out/lib/tandoor-recipes/cookbook/templates/
cp staticfiles/vue3/service-worker.js $out/lib/tandoor-recipes/cookbook/templates/
runHook postInstall
'';
pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch
+4 -2
View File
@@ -1,12 +1,14 @@
diff --git a/pytest.ini b/pytest.ini
index a3d26ec4..8bdf12fb 100644
index 2755dc99..4026b96e 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,5 +3,5 @@ DJANGO_SETTINGS_MODULE = recipes.test_settings
@@ -3,6 +3,6 @@ DJANGO_SETTINGS_MODULE = recipes.test_settings
testpaths = cookbook/tests
python_files = tests.py test_*.py *_tests.py
# uncomment to run coverage reports
-addopts = -n auto --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
+addopts = -n @NIX_BUILD_CORES@ --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
# addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
-asyncio_default_fixture_loop_scope = fixture
\ No newline at end of file
+asyncio_default_fixture_loop_scope = fixture
pkgs/by-name/uw/uwsm/package.nix
+2 -2
View File
@@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "uwsm";
version = "0.23.0";
version = "0.23.2";
src = fetchFromGitHub {
owner = "Vladimir-csp";
repo = "uwsm";
tag = "v${finalAttrs.version}";
hash = "sha256-VQhU88JvL7O2MP41JVuBdieIopmqrNiAWacGWvsNhSc=";
hash = "sha256-lKPCtlTfIAb7axthl/PUU82cULafYIhZ5xJolFKSOno=";
};
nativeBuildInputs = [
pkgs/by-name/vm/vmctl/package.nix
+3 -3
View File
@@ -16,13 +16,13 @@
stdenvNoCC.mkDerivation {
pname = "vmctl";
version = "0.99-unstable-2024-05-14";
version = "1.00";
src = fetchFromGitHub {
owner = "SamsungDS";
repo = "vmctl";
rev = "5b6b7084b8cba06b474c0e020df965237f2c832c";
hash = "sha256-yDgaY2RJXBjWkMSQb4JaJzMGLFzowfOGixSRzzv2iIk=";
rev = "8cc71d4350f4f5814ffd7a3091a5c1a9d2e25158";
hash = "sha256-nIJEgd62yq3DKhaMnB2OEaGN/zC5/Z5cTtO3iQEVF44=";
};
dontBuild = true;
pkgs/applications/gis/zombietrackergps/default.nix → pkgs/by-name/zo/zombietrackergps/package.nix
+10 -14
View File
@@ -1,40 +1,36 @@
{
mkDerivation,
lib,
stdenv,
fetchFromGitLab,
gitUpdater,
wrapQtAppsHook,
cmake,
marble,
libsForQt5,
}:
mkDerivation rec {
stdenv.mkDerivation {
pname = "zombietrackergps";
version = "1.15";
src = fetchFromGitLab {
owner = "ldutils-projects";
repo = pname;
repo = "zombietrackergps";
# latest revision is not tagged upstream, use commit sha in the meantime
#rev = "v_${version}";
rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce";
hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM=";
};
buildInputs = [
buildInputs = with libsForQt5; [
marble.dev
]
++ (with libsForQt5; [
qtbase
qtcharts
qtsvg
qtwebengine
ldutils
]);
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
preConfigure = ''
@@ -49,12 +45,12 @@ mkDerivation rec {
rev-prefix = "v_";
};
meta = with lib; {
meta = {
description = "GPS track manager for Qt using KDE Marble maps";
homepage = "https://www.zombietrackergps.net/ztgps/";
changelog = "https://www.zombietrackergps.net/ztgps/history.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sohalt ];
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ sohalt ];
platforms = lib.platforms.linux;
};
}
pkgs/development/compilers/flutter/versions/3_35/data.json
+43 -43
View File
@@ -1,73 +1,73 @@
{
"version": "3.35.0-0.3.pre",
"engineVersion": "659d9553df45256ed2aa388aae7ed5a1a4f51bae",
"version": "3.35.1",
"engineVersion": "1e9a811bf8e70466596bcf0ea3a8b5adb5f17f7f",
"engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
"engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
"channel": "beta",
"channel": "stable",
"engineHashes": {
"aarch64-linux": {
"aarch64-linux": "sha256-M1DdrGsI0qEpk/DxSlZwN3eRw87ytBZkudfWPrkgbcA=",
"x86_64-linux": "sha256-M1DdrGsI0qEpk/DxSlZwN3eRw87ytBZkudfWPrkgbcA="
"aarch64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4=",
"x86_64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4="
},
"x86_64-linux": {
"aarch64-linux": "sha256-fYd3T5t2kxJQr6VHqQWn/Cx/djYj3G4cHS6wNT656Rs=",
"x86_64-linux": "sha256-fYd3T5t2kxJQr6VHqQWn/Cx/djYj3G4cHS6wNT656Rs="
"aarch64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q=",
"x86_64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q="
}
},
"dartVersion": "3.9.0-333.2.beta",
"dartVersion": "3.9.0",
"dartHash": {
"x86_64-linux": "sha256-1QnclBC2IKuHNl2Xc1OXeG+/Owp46z4Uac3+3smimY8=",
"aarch64-linux": "sha256-g/zDpFjzTc7NEuER1jxo8hL/yzaRZeoN2Q+oa1Vs4yM=",
"x86_64-darwin": "sha256-K6DJ9O8//F3MVCmJd9vGjJg/qC83XtVrqd4pwaQeOng=",
"aarch64-darwin": "sha256-a85QVapUKgFovzC0CuLzSPSWXu8tm3HuK+AxfuwlrUI="
"x86_64-linux": "sha256-25hZuxVDfu5/8PIlfHKoeLXpESBtoGc9F3kSV56E7UA=",
"aarch64-linux": "sha256-EbxZlvvjxDUskxH0Rtxd8KOLakguucFjI7+A5Z28V+w=",
"x86_64-darwin": "sha256-JNN27p/a9+7xcIkrLLM2Tuyih5R2Q0YibXqcm3QXc8U=",
"aarch64-darwin": "sha256-VG0o4b0dPTXQmABr3+iO+xv/2IcXFt018CQYnD4kXAs="
},
"flutterHash": "sha256-K1Z/SzFK1tGC7qTbbnLXbb1fVb/wsqSvtBGUaIjKpPE=",
"flutterHash": "sha256-1G7PZLMm0VsT0CWygxOk0GGiXbtJGIBBvccQcaqV+EQ=",
"artifactHashes": {
"android": {
"aarch64-darwin": "sha256-xxWlavfiKXlEfTbYgk0+4VM4zsORuXRAaNwzYpRdU08=",
"aarch64-linux": "sha256-Wg0yuh4TJ9VroTpJqCeIwDK4uyucPUxa3f4XN7SAzUI=",
"x86_64-darwin": "sha256-xxWlavfiKXlEfTbYgk0+4VM4zsORuXRAaNwzYpRdU08=",
"x86_64-linux": "sha256-Wg0yuh4TJ9VroTpJqCeIwDK4uyucPUxa3f4XN7SAzUI="
"aarch64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=",
"aarch64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA=",
"x86_64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=",
"x86_64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA="
},
"fuchsia": {
"aarch64-darwin": "sha256-zzrbl7IPIGW8IniM5xTg8ydrXvgDg9R6d1Yr+q1pMwk=",
"aarch64-linux": "sha256-zzrbl7IPIGW8IniM5xTg8ydrXvgDg9R6d1Yr+q1pMwk=",
"x86_64-darwin": "sha256-zzrbl7IPIGW8IniM5xTg8ydrXvgDg9R6d1Yr+q1pMwk=",
"x86_64-linux": "sha256-zzrbl7IPIGW8IniM5xTg8ydrXvgDg9R6d1Yr+q1pMwk="
"aarch64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
"aarch64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
"x86_64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=",
"x86_64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s="
},
"ios": {
"aarch64-darwin": "sha256-qH5UzFC4N+3limzSFRSGaT3bSoNXeV1kgnj0ASgwU3U=",
"aarch64-linux": "sha256-qH5UzFC4N+3limzSFRSGaT3bSoNXeV1kgnj0ASgwU3U=",
"x86_64-darwin": "sha256-qH5UzFC4N+3limzSFRSGaT3bSoNXeV1kgnj0ASgwU3U=",
"x86_64-linux": "sha256-qH5UzFC4N+3limzSFRSGaT3bSoNXeV1kgnj0ASgwU3U="
"aarch64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
"aarch64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
"x86_64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=",
"x86_64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs="
},
"linux": {
"aarch64-darwin": "sha256-AfB55jB4bNv0j5fyyLZEPO0W/9I6xhn7Sh5gVppbu5o=",
"aarch64-linux": "sha256-AfB55jB4bNv0j5fyyLZEPO0W/9I6xhn7Sh5gVppbu5o=",
"x86_64-darwin": "sha256-I1jE7iGN9GNVhNi68dVNoDKuF+OxI1tM3+gttncBKfk=",
"x86_64-linux": "sha256-I1jE7iGN9GNVhNi68dVNoDKuF+OxI1tM3+gttncBKfk="
"aarch64-darwin": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=",
"aarch64-linux": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=",
"x86_64-darwin": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs=",
"x86_64-linux": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs="
},
"macos": {
"aarch64-darwin": "sha256-oR9gomhLORmE0jaUHS9SX92lfCaeGebZUC0NLiR5jEM=",
"aarch64-linux": "sha256-oR9gomhLORmE0jaUHS9SX92lfCaeGebZUC0NLiR5jEM=",
"x86_64-darwin": "sha256-oR9gomhLORmE0jaUHS9SX92lfCaeGebZUC0NLiR5jEM=",
"x86_64-linux": "sha256-oR9gomhLORmE0jaUHS9SX92lfCaeGebZUC0NLiR5jEM="
"aarch64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
"aarch64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
"x86_64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=",
"x86_64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo="
},
"universal": {
"aarch64-darwin": "sha256-Uu7H2iltu7hYMzNfn0TyUoBQcrII5zmTCMLArs2oBSA=",
"aarch64-linux": "sha256-ba7ayG8Hsb2TLFVIo6HMQrm1RKDfpcAMoBH9FDVhGN0=",
"x86_64-darwin": "sha256-NF/RKJ28q88MbKXr9gcPZmPg9Q+4IatwCiqXeVIRr/A=",
"x86_64-linux": "sha256-B1GCfIYemqzMs8ozAfqa3QmBM04dT1eKihGjyw9EZ2A="
"aarch64-darwin": "sha256-+EfVH+XpI4d/UlFs6rZKdfK00IzDFz9o4CuzJRdDNfw=",
"aarch64-linux": "sha256-1jYtJ/toFDfUG2HIKyM1XT9rl0Fzl3or67q9ZVl1vDg=",
"x86_64-darwin": "sha256-nACkicnu+Pkimpyx3q/uxUcLz/xAExLbXHl+Ex4kFzA=",
"x86_64-linux": "sha256-XGxRc2LOqgxd8Zbd2XWhA6yj39WJCa5DC5UGYIiw4RY="
},
"web": {
"aarch64-darwin": "sha256-SnhSlHAmkVdZKXH6TCsdz8HDKz2E17jIfIgpoTJ82eU=",
"aarch64-linux": "sha256-SnhSlHAmkVdZKXH6TCsdz8HDKz2E17jIfIgpoTJ82eU=",
"x86_64-darwin": "sha256-SnhSlHAmkVdZKXH6TCsdz8HDKz2E17jIfIgpoTJ82eU=",
"x86_64-linux": "sha256-SnhSlHAmkVdZKXH6TCsdz8HDKz2E17jIfIgpoTJ82eU="
"aarch64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
"aarch64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
"x86_64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=",
"x86_64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs="
},
"windows": {
"x86_64-darwin": "sha256-2N+IkOUbbFs2gtWwbpP4rdzHi0R7iMIiMwpHZUPr6C8=",
"x86_64-linux": "sha256-2N+IkOUbbFs2gtWwbpP4rdzHi0R7iMIiMwpHZUPr6C8="
"x86_64-darwin": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ=",
"x86_64-linux": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ="
}
},
"pubspecLock": {
pkgs/kde/gear/akonadi/default.nix
+8
View File
@@ -1,6 +1,7 @@
{
lib,
mkKdeDerivation,
fetchpatch,
qttools,
accounts-qt,
kaccounts-integration,
@@ -24,6 +25,13 @@ mkKdeDerivation {
patches = [
# Always regenerate MySQL config, as the store paths don't have accurate timestamps
./ignore-mysql-config-timestamp.patch
# Backport fix for Merkuro account settings not opening
# FIXME: remove in next update
(fetchpatch {
url = "https://invent.kde.org/pim/akonadi/-/commit/8a2dfd13b3c4730636a962121368d49c57f79273.patch";
hash = "sha256-r3jQUxbKvZbpKWg6SUQTyFpos7aLC5cNoByl22vpaR8=";
})
];
extraCmakeFlags = [
pkgs/top-level/all-packages.nix
-10
View File
@@ -1585,8 +1585,6 @@ with pkgs;
azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;
brakeman = callPackage ../development/tools/analysis/brakeman { };
# Derivation's result is not used by nixpkgs. Useful for validation for
# regressions of bootstrapTools on hydra and on ofborg. Example:
# pkgsCross.aarch64-multiplatform.freshBootstrapTools.build
@@ -11516,8 +11514,6 @@ with pkgs;
wxGTK = wxGTK32;
};
zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { };
### APPLICATIONS
_2bwm = callPackage ../applications/window-managers/2bwm {
@@ -12535,8 +12531,6 @@ with pkgs;
callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop
{ };
ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { };
kubeval = callPackage ../applications/networking/cluster/kubeval { };
kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
@@ -13372,10 +13366,6 @@ with pkgs;
spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { };
squishyball = callPackage ../applications/audio/squishyball {
ncurses = ncurses5;
};
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
stag = callPackage ../applications/misc/stag {