Merge master into staging-nixos
This commit is contained in:
@@ -21463,6 +21463,12 @@
|
||||
githubId = 4033651;
|
||||
name = "Keagan McClelland";
|
||||
};
|
||||
prophetofxenu = {
|
||||
email = "xenu@prophetofxenu.net";
|
||||
github = "prophetofxenu";
|
||||
githubId = 20529712;
|
||||
name = "William Harrell";
|
||||
};
|
||||
protoben = {
|
||||
email = "protob3n@gmail.com";
|
||||
github = "protoben";
|
||||
|
||||
@@ -163,6 +163,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- [hardware.xpadneo](#opt-hardware.xpadneo.enable) now supports configuring kernel module parameters via a freeform [settings](#opt-hardware.xpadneo.settings) option, with convenience options for [rumble attenuation](#opt-hardware.xpadneo.rumbleAttenuation) and [controller quirks](#opt-hardware.xpadneo.quirks).
|
||||
|
||||
- Wine has been updated to the 11.0 branch. Please check the [upstream announcement](https://gitlab.winehq.org/wine/wine/-/releases/wine-11.0) for more details.
|
||||
|
||||
- Cinnamon has been updated to 6.6, please check the [upstream announcement](https://www.linuxmint.com/rel_zena_whatsnew.php) for more details.
|
||||
|
||||
@@ -1,17 +1,126 @@
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.hardware.xpadneo;
|
||||
|
||||
modprobeConfig =
|
||||
let
|
||||
params = lib.mapAttrsToList (name: value: "${name}=${toString value}") cfg.settings;
|
||||
in
|
||||
lib.optionalString (params != [ ]) "options hid_xpadneo ${lib.concatStringsSep " " params}";
|
||||
in
|
||||
{
|
||||
options.hardware.xpadneo = {
|
||||
enable = lib.mkEnableOption "the xpadneo driver for Xbox One wireless controllers";
|
||||
|
||||
rumbleAttenuation = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
options = {
|
||||
overall = lib.mkOption {
|
||||
type = lib.types.ints.between 0 100;
|
||||
default = 0;
|
||||
description = ''
|
||||
Overall force feedback attenuation as a percentage.
|
||||
`0` means full rumble, `100` means no rumble.
|
||||
Applies to both main and trigger rumble.
|
||||
'';
|
||||
};
|
||||
triggers = lib.mkOption {
|
||||
type = lib.types.nullOr (lib.types.ints.between 0 100);
|
||||
default = null;
|
||||
description = ''
|
||||
Extra attenuation for trigger rumble as a percentage, applied
|
||||
on top of {option}`overall`. For example, `overall = 50` and
|
||||
`triggers = 50` results in 50% main rumble and 25% trigger rumble.
|
||||
Set to `100` to disable trigger rumble while keeping main rumble.
|
||||
`null` means no extra trigger attenuation.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
overall = 50; # 50% overall rumble
|
||||
triggers = 50; # 25% trigger rumble (50% of 50%)
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Force feedback attenuation settings. Higher values reduce rumble strength.
|
||||
|
||||
See <https://github.com/atar-axis/xpadneo/blob/master/docs/CONFIGURATION.md>
|
||||
for more information.
|
||||
'';
|
||||
};
|
||||
|
||||
quirks = lib.mkOption {
|
||||
type = lib.types.attrsOf (lib.types.ints.u16);
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
"11:22:33:44:55:66" = 7; # Applies flags 1 + 2 + 4
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Controller-specific quirk flags, keyed by MAC address.
|
||||
Flags are combined as a bitmask to address compatibility issues
|
||||
with specific controllers.
|
||||
|
||||
The value is a sum of individual flag values. For example, to apply
|
||||
flags 1, 2, and 4, use `7` (1 + 2 + 4). To apply flags 2, 4, and 32,
|
||||
use `38` (2 + 4 + 32).
|
||||
|
||||
See <https://github.com/atar-axis/xpadneo/blob/master/docs/CONFIGURATION.md>
|
||||
for available quirk flags and their values.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.oneOf [
|
||||
lib.types.int
|
||||
lib.types.str
|
||||
]
|
||||
);
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
disable_deadzones = 1;
|
||||
trigger_rumble_mode = 2;
|
||||
disable_shift_mode = 1;
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Kernel module parameters for hid_xpadneo. These are passed directly
|
||||
to the module via modprobe.
|
||||
|
||||
See <https://github.com/atar-axis/xpadneo/blob/master/docs/CONFIGURATION.md>
|
||||
for available parameters and their values.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
hardware.xpadneo.settings =
|
||||
lib.optionalAttrs (cfg.rumbleAttenuation.overall != 0 || cfg.rumbleAttenuation.triggers != null) {
|
||||
rumble_attenuation =
|
||||
toString cfg.rumbleAttenuation.overall
|
||||
+ lib.optionalString (cfg.rumbleAttenuation.triggers != null) (
|
||||
"," + toString cfg.rumbleAttenuation.triggers
|
||||
);
|
||||
}
|
||||
// lib.optionalAttrs (cfg.quirks != { }) {
|
||||
quirks = lib.concatStringsSep "," (
|
||||
lib.mapAttrsToList (mac: flags: "${mac}:${toString flags}") cfg.quirks
|
||||
);
|
||||
};
|
||||
|
||||
boot = {
|
||||
# Must disable Enhanced Retransmission Mode to support bluetooth pairing
|
||||
# https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
|
||||
extraModprobeConfig = lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12") "options bluetooth disable_ertm=1";
|
||||
extraModprobeConfig = lib.mkMerge [
|
||||
# Must disable Enhanced Retransmission Mode to support bluetooth pairing
|
||||
# https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
|
||||
(lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12") "options bluetooth disable_ertm=1")
|
||||
modprobeConfig
|
||||
];
|
||||
extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
|
||||
kernelModules = [ "hid_xpadneo" ];
|
||||
};
|
||||
|
||||
@@ -105,7 +105,7 @@ in
|
||||
};
|
||||
|
||||
outputDir = mkOption {
|
||||
type = types.path;
|
||||
type = types.nullOr types.path;
|
||||
default = "${cfg.configDir}/output";
|
||||
defaultText = "\${cfg.configDir}/output";
|
||||
description = "Directory where cross-seed will place torrent files it finds.";
|
||||
@@ -193,7 +193,8 @@ in
|
||||
inherit (cfg) group user;
|
||||
mode = "700";
|
||||
};
|
||||
|
||||
}
|
||||
// lib.optionalAttrs (cfg.settings.outputDir != null) {
|
||||
${cfg.settings.outputDir}.d = {
|
||||
inherit (cfg) group user;
|
||||
mode = "750";
|
||||
@@ -222,7 +223,7 @@ in
|
||||
LoadCredential = lib.mkIf (cfg.settingsFile != null) "secretSettingsFile:${cfg.settingsFile}";
|
||||
|
||||
StateDirectory = "cross-seed";
|
||||
ReadWritePaths = [ cfg.settings.outputDir ];
|
||||
ReadWritePaths = lib.optional (cfg.settings.outputDir != null) cfg.settings.outputDir;
|
||||
ReadOnlyPaths = lib.optional (cfg.settings.torrentDir != null) cfg.settings.torrentDir;
|
||||
};
|
||||
|
||||
@@ -231,7 +232,7 @@ in
|
||||
RequiresMountsFor = lib.flatten [
|
||||
cfg.settings.dataDirs
|
||||
cfg.settings.linkDirs
|
||||
cfg.settings.outputDir
|
||||
(lib.optional (cfg.settings.outputDir != null) cfg.settings.outputDir)
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
+16
-1
@@ -5,7 +5,17 @@
|
||||
|
||||
nodes = {
|
||||
machine = {
|
||||
config.hardware.xpadneo.enable = true;
|
||||
config.hardware.xpadneo = {
|
||||
enable = true;
|
||||
rumbleAttenuation = {
|
||||
overall = 50;
|
||||
triggers = 25;
|
||||
};
|
||||
settings = {
|
||||
disable_deadzones = 1;
|
||||
trigger_rumble_mode = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -15,5 +25,10 @@
|
||||
testScript = ''
|
||||
machine.start();
|
||||
machine.succeed("modinfo hid_xpadneo | grep 'version:\s\+${pkgs.linuxPackages.xpadneo.version}'")
|
||||
|
||||
machine.succeed("grep 'options hid_xpadneo' /etc/modprobe.d/nixos.conf")
|
||||
machine.succeed("grep 'disable_deadzones=1' /etc/modprobe.d/nixos.conf")
|
||||
machine.succeed("grep 'trigger_rumble_mode=2' /etc/modprobe.d/nixos.conf")
|
||||
machine.succeed("grep 'rumble_attenuation=50,25' /etc/modprobe.d/nixos.conf")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1617,6 +1617,14 @@ assertNoAdditions {
|
||||
dependencies = [ self.lush-nvim ];
|
||||
};
|
||||
|
||||
jj-nvim = super.jj-nvim.overrideAttrs {
|
||||
# Don't install 30 MB of GIFs
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r lua $out
|
||||
'';
|
||||
};
|
||||
|
||||
jupytext-nvim = super.jupytext-nvim.overrideAttrs {
|
||||
passthru.python3Dependencies = ps: [ ps.jupytext ];
|
||||
};
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.57.1";
|
||||
hash = "sha256-EBRuYqZ6UTuu2FRjxdDCRqRm4DKzH/3yWyOypoIxJRU=";
|
||||
version = "3.62.0";
|
||||
hash = "sha256-CIeLmwNlOFdFq6VTKv5YYTEN1YofdwROKFzTfvg/Gls=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -36,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "notmuch";
|
||||
version = "0.39";
|
||||
version = "0.40";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://notmuchmail.org/releases/notmuch-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-uIuwKnbEa62NMT/Su0+OOSmLUfZvy+swTZ+Aw+73BOM=";
|
||||
hash = "sha256-S0MUu/HCAp/feTY35se7FcGxcw0ivpqgSAPJjFu8RG8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "algia";
|
||||
version = "0.0.102";
|
||||
version = "0.0.104";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "algia";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vpZL4UNDtcJRsBA0th6/YccE/3GG7kzHrgJ3RWpgSk8=";
|
||||
hash = "sha256-E+10IX2gpxFUg0uEcIQIYSNk6rI4JG9ieEwNx3p7sMM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -85,7 +85,7 @@
|
||||
@@ -110,7 +110,7 @@
|
||||
set(DLIB_USE_MKL_FFT OFF)
|
||||
set(DLIB_USE_FFMPEG OFF)
|
||||
set(CMAKE_CXX_STANDARD 17) # dlib must be compiled with C++17
|
||||
@@ -9,19 +9,33 @@
|
||||
set(CMAKE_CXX_STANDARD 20) # continue with C++20
|
||||
add_compile_definitions("DLIB_AVAILABLE")
|
||||
endif()
|
||||
@@ -105,8 +105,9 @@
|
||||
GIT_REPOSITORY https://github.com/klytje/gcem
|
||||
@@ -141,7 +141,6 @@
|
||||
thread_pool
|
||||
GIT_REPOSITORY https://github.com/bshoshany/thread-pool
|
||||
)
|
||||
- FetchContent_MakeAvailable(thread_pool)
|
||||
endif()
|
||||
|
||||
if(USE_SYSTEM_GCEM)
|
||||
@@ -151,7 +150,6 @@
|
||||
gcem
|
||||
GIT_REPOSITORY https://github.com/klytje/gcem
|
||||
)
|
||||
- FetchContent_MakeAvailable(GCEM)
|
||||
endif()
|
||||
|
||||
set_property(
|
||||
@@ -160,7 +158,9 @@
|
||||
)
|
||||
unset(compile_options)
|
||||
|
||||
-FetchContent_MakeAvailable(thread_pool GCEM backward)
|
||||
-include_directories(${thread_pool_SOURCE_DIR}/include ${gcem_SOURCE_DIR}/include ${backward_SOURCE_DIR})
|
||||
+include_directories(${backward_SOURCE_DIR})
|
||||
+add_subdirectory(gcem)
|
||||
+add_subdirectory(backward)
|
||||
+include_directories(thread_pool/include gcem/include backward)
|
||||
+include_directories(thread_pool/include gcem/include)
|
||||
|
||||
############################################
|
||||
## Find and link CURL ##
|
||||
|
||||
--- a/executable/gui/CMakeLists.txt
|
||||
+++ b/executable/gui/CMakeLists.txt
|
||||
@@ -6,7 +6,9 @@
|
||||
@@ -35,20 +49,3 @@
|
||||
|
||||
# set the path to the elements root & module path
|
||||
set(ELEMENTS_ROOT "${elements_SOURCE_DIR}")
|
||||
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -18,10 +18,10 @@
|
||||
GIT_TAG 914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a
|
||||
GIT_PROGRESS TRUE
|
||||
)
|
||||
-FetchContent_MakeAvailable(Catch2)
|
||||
+add_subdirectory(${CMAKE_SOURCE_DIR}/catch2 catch2_build)
|
||||
|
||||
# make the tests available through CTest
|
||||
-list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
|
||||
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/catch2/extras)
|
||||
include(CTest)
|
||||
include(Catch)
|
||||
|
||||
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
pkg-config,
|
||||
cairo,
|
||||
gtk3,
|
||||
catch2_3,
|
||||
backward-cpp,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -35,20 +37,6 @@ let
|
||||
hash = "sha256-bnWakLHl/afpeFm6S32ku0IkniyIs8X+LE1NmV6p0ho=";
|
||||
};
|
||||
|
||||
backward-cpp = fetchFromGitHub {
|
||||
owner = "bombela";
|
||||
repo = "backward-cpp";
|
||||
rev = "0bfd0a07a61551413ccd2ab9a9099af3bad40681";
|
||||
hash = "sha256-nLH8jfdgzmlUTg6zwY/h0HVnDMeC9rvmX1x4Ithu9dI=";
|
||||
};
|
||||
|
||||
catch2 = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a";
|
||||
hash = "sha256-2gK+CUpml6AaHcwNoq0tHLr2NwqtMPx+jP80/LLFFr4=";
|
||||
};
|
||||
|
||||
elements = fetchFromGitHub {
|
||||
owner = "cycfi";
|
||||
repo = "elements";
|
||||
@@ -80,13 +68,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ausaxs";
|
||||
version = "1.1.7";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AUSAXS";
|
||||
repo = "AUSAXS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/d6EXDn60ap7dluJZtVP5vGiJTn4ggF7XYZ6ONGipDs=";
|
||||
hash = "sha256-vTuQsg76p0WHPadwqBdDGBSNgNmr5TxuwlNj47P+sa8=";
|
||||
};
|
||||
|
||||
patches = [ ./cmake-no-fetchcontent.patch ];
|
||||
@@ -95,23 +83,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cp --recursive --no-preserve=mode ${dlib} dlib
|
||||
cp --recursive --no-preserve=mode ${thread-pool} thread_pool
|
||||
cp --recursive --no-preserve=mode ${gcem} gcem
|
||||
cp --recursive --no-preserve=mode ${backward-cpp} backward
|
||||
cp --recursive --no-preserve=mode ${catch2} catch2
|
||||
cp --recursive --no-preserve=mode ${nfd} nfd
|
||||
cp --recursive --no-preserve=mode ${elements} elements
|
||||
cp --recursive --no-preserve=mode ${asio} asio
|
||||
cp --recursive --no-preserve=mode ${cycfi_infra} cycfi_infra
|
||||
substituteInPlace executable/CMakeLists.txt \
|
||||
--replace-fail "FetchContent_MakeAvailable(CLI11)" "find_package(CLI11 CONFIG REQUIRED)"
|
||||
substituteInPlace include/crystal/crystal/miller/MillerGenerationFactory.h \
|
||||
--replace-fail "namespace ausaxs::settings::crystal {enum class MillerGenerationChoice;}" '#include "../core/settings/CrystalSettings.h"'
|
||||
patch -p1 -d elements < ${./elements-cmake-no-fetchcontent.patch}
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "-mavx" "${
|
||||
lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux) "-msse3"
|
||||
}"
|
||||
sed -i '/#include <iostream>/a\
|
||||
#include <numbers>' source/crystal/miller/FibonacciMillers.cpp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -122,6 +102,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
backward-cpp
|
||||
catch2_3
|
||||
curl
|
||||
cli11
|
||||
cairo
|
||||
@@ -129,7 +111,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk3
|
||||
];
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "GUI" true) ];
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "GUI" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_CATCH" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_CLI11" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_BACKWARD" true)
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cp --recursive lib/* $out/lib/
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "beancount-language-server";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarmutex";
|
||||
repo = "beancount-language-server";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HQXLPXs/huoFSM0tqs8FN/hggJauMwef7SbLb2tZoZc=";
|
||||
hash = "sha256-TLpYnq+EiWg+X8pviErMkTU8R6gxwqasTSnA76PcF6U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Zdz+zn8oZnLAarQySVpuBK+Mwf21Bm7Ug9ECNwlAZYs=";
|
||||
cargoHash = "sha256-xxFHIJT935NLF9xl9AF1ipiaLhs4WGW1pqtLPDK4Wnk=";
|
||||
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
|
||||
@@ -51,6 +51,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
INSTA_UPDATE = "no";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
# Installs biome schema aside with the package
|
||||
install -Dm644 packages/@biomejs/biome/configuration_schema.json $out/share/schema.json
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# tests assume git repository
|
||||
git init
|
||||
@@ -69,6 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
isabelroses
|
||||
wrbbz
|
||||
eveeifyeve # Schema
|
||||
];
|
||||
mainProgram = "biome";
|
||||
};
|
||||
|
||||
@@ -39,6 +39,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
zstd
|
||||
];
|
||||
|
||||
patches = [
|
||||
./skip-icon-macos.patch
|
||||
];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"tauri-cli"
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
diff --git a/crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg b/crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg
|
||||
index fee840034..cfa584d52 100644
|
||||
--- a/crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg
|
||||
+++ b/crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg
|
||||
@@ -461,12 +461,6 @@ if [[ -n "$QL_LINK" ]]; then
|
||||
ln -s "/Library/QuickLook" "$MOUNT_DIR/QuickLook"
|
||||
fi
|
||||
|
||||
-if [[ -n "$VOLUME_ICON_FILE" ]]; then
|
||||
- echo "Copying volume icon file '$VOLUME_ICON_FILE'..."
|
||||
- cp "$VOLUME_ICON_FILE" "$MOUNT_DIR/.VolumeIcon.icns"
|
||||
- SetFile -c icnC "$MOUNT_DIR/.VolumeIcon.icns"
|
||||
-fi
|
||||
-
|
||||
if [[ -n "$ADD_FILE_SOURCES" ]]; then
|
||||
echo "Copying custom files..."
|
||||
for i in "${!ADD_FILE_SOURCES[@]}"; do
|
||||
@@ -538,11 +532,6 @@ else
|
||||
echo "Skipping blessing on sandbox"
|
||||
fi
|
||||
|
||||
-if [[ -n "$VOLUME_ICON_FILE" ]]; then
|
||||
- # Tell the volume that it has a special file attribute
|
||||
- SetFile -a C "$MOUNT_DIR"
|
||||
-fi
|
||||
-
|
||||
# Delete unnecessary file system events log if possible
|
||||
echo "Deleting .fseventsd"
|
||||
rm -rf "${MOUNT_DIR}/.fseventsd" || true
|
||||
@@ -6,15 +6,14 @@ Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
|
||||
|
||||
---
|
||||
plugins/power/csd-power-manager.c | 4 ++--
|
||||
.../org.cinnamon.settings-daemon.plugins.power.policy.in | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
|
||||
index 33f4489..84dd98b 100644
|
||||
index e80ea05..f02454e 100644
|
||||
--- a/plugins/power/csd-power-manager.c
|
||||
+++ b/plugins/power/csd-power-manager.c
|
||||
@@ -2529,7 +2529,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
|
||||
#endif
|
||||
@@ -2481,7 +2481,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
|
||||
gchar *endptr = NULL;
|
||||
|
||||
/* get the data */
|
||||
- command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s",
|
||||
@@ -22,7 +21,7 @@ index 33f4489..84dd98b 100644
|
||||
argument,
|
||||
manager->priv->backlight_helper_preference_args);
|
||||
ret = g_spawn_command_line_sync (command,
|
||||
@@ -2619,7 +2619,7 @@ backlight_helper_set_value (const gchar *argument,
|
||||
@@ -2571,7 +2571,7 @@ backlight_helper_set_value (const gchar *argument,
|
||||
#endif
|
||||
|
||||
/* get the data */
|
||||
@@ -31,19 +30,3 @@ index 33f4489..84dd98b 100644
|
||||
argument, value,
|
||||
manager->priv->backlight_helper_preference_args);
|
||||
ret = g_spawn_command_line_sync (command,
|
||||
diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
|
||||
index 504f017..3569e8c 100644
|
||||
--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
|
||||
+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
|
||||
@@ -25,7 +25,7 @@
|
||||
<allow_inactive>no</allow_inactive>
|
||||
<allow_active>yes</allow_active>
|
||||
</defaults>
|
||||
- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/csd-backlight-helper</annotate>
|
||||
+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper</annotate>
|
||||
</action>
|
||||
|
||||
</policyconfig>
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "cosmic-ext-applet-weather";
|
||||
version = "0-unstable-2026-02-03";
|
||||
version = "0-unstable-2026-02-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "cosmic-ext-applet-weather";
|
||||
rev = "ea8a506a6ca56b6ac6c4952012880bf1d6227631";
|
||||
hash = "sha256-DnYOOeCcf/fuNuPJ8MeolfAyGJdNWONawaF1HV8mr4k=";
|
||||
rev = "a40b0e201131723e6a60a9b3ae808bf583815a49";
|
||||
hash = "sha256-J4CVbidFfKNiOGB/dt2rNi6nKh0WyxZ9EoS5Vmlsu+0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tj0skQNt0p6UMUnU6HXw6ZAjEkCuuF4vg1aoWytqCos=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "cross-seed";
|
||||
version = "6.13.5";
|
||||
version = "6.13.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cross-seed";
|
||||
repo = "cross-seed";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WdKd20vzJfWvnZKBID6IzXOScrZgPKDDafzT2PY9N9k=";
|
||||
hash = "sha256-E2tnlDU2/msNcSsoDXvwGWFhWpXEByloUmlVp2tckwo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-iTho+dbJAt7B2R+dN2xo6jnRo/psjQE76GHYksoojdA=";
|
||||
npmDepsHash = "sha256-tR7zPoIX6yjlRx8QbRSxskvueQ1BsP3gGAlonKHH0RY=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script;
|
||||
|
||||
@@ -21,18 +21,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "crosvm";
|
||||
version = "0-unstable-2025-11-24";
|
||||
version = "0-unstable-2026-02-13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "18bc84d003e04108d973a5233f0c6f3b2039d756";
|
||||
hash = "sha256-7nm9QSmDkiUoTMcM1oMK1/QwSAnLAgvuYPoxTaJWMpQ=";
|
||||
rev = "4c80bf3523cf84114054209d88a7af3eefd8423f";
|
||||
hash = "sha256-JpOw2DJsSjgm14M3ZenlXhnnNeYZC+G8jw8e9oEsBnQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-NeyJLsE/Uvcg/kNzS1SXEBjExKwbjcHkkhT2jSQjxx4=";
|
||||
cargoHash = "sha256-AW/Gzbksek0mZ3UCtK64SfaHdY7/FHVrQmQ9xyW8MZQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "feishin";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffvli";
|
||||
repo = "feishin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fDGKHe7f2bdxCc88rG9+WDFFCROVtbq5gsoHNLIjuzg=";
|
||||
hash = "sha256-PICVNItpMALffpJvQQXLlHcYu1yDtEUclGYjO25f6ew=";
|
||||
};
|
||||
|
||||
electron = electron_39;
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
let
|
||||
pname = "fflogs";
|
||||
version = "8.19.70";
|
||||
version = "8.20.17";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
|
||||
hash = "sha256-uDcQUAXDytrO3XFArJkuI0oV5/Z2dUJyY8OLx1WtraU=";
|
||||
hash = "sha256-2gul6DwuhB9iy3BR8u+rIIWz2G+nX1IA7c6cqq1QYlg=";
|
||||
};
|
||||
extracted = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-desktop";
|
||||
version = "44.4";
|
||||
version = "44.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-HYy5xqMo62ibDBJpz1ODTMhNhR1+cZcM2ruoJwa0SYQ=";
|
||||
sha256 = "sha256-IOCZWm46A+jBAmxaJ7w/Reaf/MOSrXQ9yrYQelQdIy8=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.56.3";
|
||||
version = "3.56.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-OFlvF+Amn3fhYjpr95VpVzx733t82GP7R4p4rmZN6jA=";
|
||||
hash = "sha256-KoMeratF44quM+ginDyUTfoVId6cMUDTYCqSd8qhYbM=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -74,7 +74,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell";
|
||||
version = "49.3";
|
||||
version = "49.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-KPDb1kRS8AVxKfImdTyV0nJt4H8fX0c63cfDxQem0xo=";
|
||||
hash = "sha256-nW8MovAUDBFPEU9nB0E2EfYU+x6mwxeo0fzEDDxZWwg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -112,15 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/dcd112d9708954187e7490564c2229d82ba5326f/f/0001-gdm-Work-around-failing-fingerprint-auth.patch";
|
||||
hash = "sha256-mgXty5HhiwUO1UV3/eDgWtauQKM0cRFQ0U7uocST25s=";
|
||||
})
|
||||
|
||||
# Fix crash when switching to hands-free mode on a bluetooth headset
|
||||
(fetchpatch {
|
||||
name = "fix-bluetooth-handsfree-crash.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/merge_requests/31.patch";
|
||||
hash = "sha256-jFbItlXT05nnp825R/HvsWDFxAMzL4z36CsxhQ2sEIY=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "subprojects/gvc/";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -34,11 +34,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gthumb";
|
||||
version = "3.12.9";
|
||||
version = "3.12.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-13+ItWneSSV4BzDnhnspB3GNpmBowkLd6bvaEH4YP/o=";
|
||||
sha256 = "sha256-MiI0RlPNb7XXmBtzlRrj2QxBT3QiCoschmWyVXQoTHU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -6,33 +6,22 @@
|
||||
rustc,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
nodePackages,
|
||||
rustPlatform,
|
||||
tailwindcss_3,
|
||||
wasm-bindgen-cli_0_2_100,
|
||||
wasm-bindgen-cli_0_2_106,
|
||||
}:
|
||||
let
|
||||
tailwindcss = tailwindcss_3.overrideAttrs (_prev: {
|
||||
plugins = [
|
||||
nodePackages."@tailwindcss/aspect-ratio"
|
||||
nodePackages."@tailwindcss/forms"
|
||||
nodePackages."@tailwindcss/line-clamp"
|
||||
nodePackages."@tailwindcss/typography"
|
||||
];
|
||||
});
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "idmail";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oddlama";
|
||||
repo = "idmail";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9rl2UG8DeWd8hVh3N+dqyV5gO0LErok+kZ1vQZnVAe8=";
|
||||
hash = "sha256-b18Ic+wffCPfp1cDTxDe7IBigbS4X6t7KaAy7P4Uh28=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UcS2gAoa2fzPu6hh8I5sXSHHbAmzsecT44Ju2CVsK0Q=";
|
||||
cargoHash = "sha256-FU9CfOJ9tNY+97OZDw2qYZHTPoFp9Ch2VigXaxBnFCw=";
|
||||
|
||||
env = {
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
@@ -40,11 +29,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wasm-bindgen-cli_0_2_100
|
||||
wasm-bindgen-cli_0_2_106
|
||||
binaryen
|
||||
cargo-leptos
|
||||
rustc.llvmPackages.lld
|
||||
tailwindcss
|
||||
tailwindcss_3
|
||||
makeWrapper
|
||||
];
|
||||
buildPhase = ''
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "komikku";
|
||||
version = "1.102.0";
|
||||
version = "1.103.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wxGDy/cM9IBpgPNdun/P9f4447hJaaibBgIgLVaOirY=";
|
||||
hash = "sha256-1RYuaVIdiADAmbzXG8vi1eNoDh8yBL3aVfBsMiGd3h4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lasuite-meet-frontend";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VUOTGRI3U9G4BfZMBk81MifcpALGA6OY3g++rCFZC5U=";
|
||||
hash = "sha256-j5kkmaB91y6KDROZjkUbosdmSG+udo6D/gcyfsU4Bbs=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/frontend";
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage rec {
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit version src;
|
||||
sourceRoot = "source/src/frontend";
|
||||
hash = "sha256-7dSXPkSXiOL43AUtkrYztkH8n8ZzS75LTkQWJIsY/OE=";
|
||||
hash = "sha256-IIwTRAdEJX4Uk+//5aGQsLMNtQDbaw6w8c91M9p4fQc=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "lasuite-meet";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "meet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VUOTGRI3U9G4BfZMBk81MifcpALGA6OY3g++rCFZC5U=";
|
||||
hash = "sha256-j5kkmaB91y6KDROZjkUbosdmSG+udo6D/gcyfsU4Bbs=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src/backend";
|
||||
@@ -40,6 +40,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
brevo-python
|
||||
brotli
|
||||
celery
|
||||
dj-database-url
|
||||
django
|
||||
django-configurations
|
||||
django-cors-headers
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libglycin";
|
||||
version = "2.0.7";
|
||||
version = "2.0.8";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xBasKbbT7NxnuQwVU3uhKTzrevlvoQHK5nt9HTflCrA=";
|
||||
hash = "sha256-a5rvT2Jr+Wnf0EtWO4PVIScaMMPW32pqhGP9VUkIkd8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-UVVVjMt4vWkLob0H/MxIaW6rkBSFImu+5dezaCnc3Q8=";
|
||||
hash = "sha256-k3eHWdEUPjKuWqNaEAYjAQKvYFgCnZ+5laYujqgGrpQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
makeDesktopItem,
|
||||
n64recomp,
|
||||
directx-shader-compiler,
|
||||
forceX11 ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -42,13 +41,13 @@ in
|
||||
|
||||
llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mariokart64recomp";
|
||||
version = "0.9.1-unstable-2025-10-15";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sonicdcer";
|
||||
repo = "MarioKart64Recomp";
|
||||
rev = "f019c3906d47cddbc8bcbea744948b9f4825f54d";
|
||||
hash = "sha256-lMN7FY9EvFbHEc3bLiTWP9LS15syo7dANxeFOpS4YaA=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7h2dxa8yR5y03FGdoF9eLTv7ZQY7IkXPtkwu7Q+SbAo=";
|
||||
preFetch = ''
|
||||
export GIT_CONFIG_COUNT=1
|
||||
export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf
|
||||
@@ -82,7 +81,6 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
|
||||
icon = "MarioKart64Recompiled";
|
||||
exec = "MarioKart64Recompiled";
|
||||
comment = "Recompilation of MarioKart 64";
|
||||
genericName = "Recompilation of MarioKart 64";
|
||||
desktopName = "MarioKart64Recompiled";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
@@ -118,7 +116,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
installBin MarioKart64Recompiled
|
||||
install -Dm644 -t $out/share ../recompcontrollerdb.txt
|
||||
install -Dm644 ../icons/512.png $out/share/icons/hicolor/scalable/apps/MarioKart64Recompiled.png
|
||||
install -Dm644 ../icons/512.png $out/share/icons/hicolor/512x512/apps/MarioKart64Recompiled.png
|
||||
install -Dm644 ../flatpak/io.github.mariokart64recomp.mariokart64recomp.desktop $out/share/applications/MarioKart64Recompiled.desktop
|
||||
cp -r ../assets $out/share/
|
||||
ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt
|
||||
@@ -139,13 +137,9 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
|
||||
)
|
||||
'';
|
||||
|
||||
# This is needed as MarioKart64Recompiled will segfault when not run from the same
|
||||
# directory as the binary. It also used to exit when run without X11. Recent rt64
|
||||
# updates enabled wayland support, but leave the option to disable this on the
|
||||
# application level if desired.
|
||||
# The game will segfault when not run from the same directory as the binary.
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/bin/" \
|
||||
${lib.optionalString forceX11 "--set SDL_VIDEODRIVER x11"}
|
||||
wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/bin/"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -162,11 +162,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "144.0.3719.115";
|
||||
version = "145.0.3800.58";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-HoV2D51zxewFwwu92efEDgohu1yJf1UyjekO3YWZqPc=";
|
||||
hash = "sha256-RmXe5w7UQALjjEPfrH3l5nyi0U58x5OlNrtfWIY48U0=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2026-02-07";
|
||||
version = "0-unstable-2026-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "models.dev";
|
||||
rev = "e1747322adc49416ca2dcd52de1bbcda6fdbaf1f";
|
||||
hash = "sha256-ZVMPh8DYQdFDYdF0Jvfh4gKEGrRsdypws4GjLjsfXFU=";
|
||||
rev = "5a008354709f3331f1070cb2c70c184ac8845996";
|
||||
hash = "sha256-XMblZXkqrtZSHa0d96sbPtcMQCJfnHZdnQEpaZqc0O0=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mongodb-atlas-cli";
|
||||
version = "1.52.0";
|
||||
version = "1.52.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongodb-atlas-cli";
|
||||
tag = "atlascli/v${finalAttrs.version}";
|
||||
hash = "sha256-2JCDUWgMtt1dKqOMn220siSaqqafv12ho84wN9v44sQ=";
|
||||
hash = "sha256-cczro985Oj0fwsR1Xfymo0BagCYPDxVuC9Cf/e7a/yE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bKi+u4FFD6A7HQwJnPTq3JTqOEig8oUQAHI4BQV+Rro=";
|
||||
vendorHash = "sha256-YdGZmPOCIBjaUtLLrqw2I4cXcAiaNzAzqaNszndw+ZY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "49.3";
|
||||
version = "49.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-nvH2HW/kAcyj/L5tmjsqT5tCY4y/hENzVmamGWSo8MM=";
|
||||
hash = "sha256-wWZuxQVhUwviXLiNk5wrzCrzTwHGO4sWuCuJLuM9eFU=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nautilus";
|
||||
version = "49.3";
|
||||
version = "49.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-qmvzdvCJkjYoBergGJCxv1rRSPNWqnzP4fZk7aiNQT4=";
|
||||
hash = "sha256-FHbZRZpjyF8OvBjyN7MtErAIrXhgAjdkJJGXJfUOdqg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
makeBinaryWrapper,
|
||||
coreutils,
|
||||
nix-prefetch-darcs,
|
||||
nix-prefetch-fossil,
|
||||
nix-prefetch-git,
|
||||
nix-prefetch-pijul,
|
||||
testers,
|
||||
@@ -16,7 +17,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
pname = "nixtamal";
|
||||
version = "0.3.1-beta";
|
||||
version = "1.0.0";
|
||||
release_year = 2026;
|
||||
|
||||
minimalOCamlVersion = "5.3";
|
||||
@@ -25,7 +26,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
url = "https://darcs.toastal.in.th/nixtamal/stable/";
|
||||
mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ePJs3HygB1xwDzVM4KiqmhiLdZHUpZyzybEf23wmKm8=";
|
||||
hash = "sha256-PJ03psJhRHq0ud/mXuUZSzpQ9RhO3p4s+lrGcHek3Rc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -76,6 +77,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
nix-prefetch-darcs
|
||||
nix-prefetch-fossil
|
||||
nix-prefetch-git
|
||||
nix-prefetch-pijul
|
||||
]
|
||||
@@ -100,7 +102,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
• Automate the manual work of input pinning, allowing to lock & refresh inputs
|
||||
• Declaritive KDL manifest file over imperative CLI flags
|
||||
• Host, forge, VCS-agnostic
|
||||
• Choose eval time fetchers (builtins) or build time fetchers (Nixpkgs, default) — which opens up fetching Darcs & Pijul
|
||||
• Choose eval time fetchers (builtins) or build time fetchers (Nixpkgs, default) — which opens up fetching Darcs, Pijul, & Fossil
|
||||
• Supports mirrors
|
||||
• Override hash algorithm on a per-project & per-input basis — including BLAKE3 support
|
||||
• Custom freshness commands
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openimageio";
|
||||
version = "3.1.9.0";
|
||||
version = "3.1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenImageIO";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0XN/Bcmpi3jUBtgvTlcqXLFuMS51UrzbpZ+eAb7QPRI=";
|
||||
hash = "sha256-xErP9zBKIBwCrw698oAaCxXCO9rqBDuz+6R+uU+9n3E=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "oxlint";
|
||||
version = "1.43.0";
|
||||
version = "1.47.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxc-project";
|
||||
repo = "oxc";
|
||||
tag = "oxlint_v${finalAttrs.version}";
|
||||
hash = "sha256-J32iHYWfUSPgs0TbB9kHxwgdPB7/cPvKTI28K5nUlVU=";
|
||||
hash = "sha256-fzM+sVCQmZkBfMbD/Ko6R2zwosgOe0xJWBgOKbJ26uY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2W0X9uy1V6cKJTjIIWNfd5vhptITrmh6uJYeCleXG8E=";
|
||||
cargoHash = "sha256-e5DqyFqK/imxEkRchycpDZp+7B1lXdsYJLzVNzzQ7Kw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "papers";
|
||||
version = "49.3";
|
||||
version = "49.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-dpddnR/S+Iw2j+yMMfDlb6ndk6G46F+s6qQDxZpVqpA=";
|
||||
hash = "sha256-XjBTXnNCHc0xQkCrsg4leToFOlzWWG6tCMNQx7jm+HE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -1,17 +1,3 @@
|
||||
/**
|
||||
# Example
|
||||
|
||||
Prettier with plugins and Vim Home Manager configuration
|
||||
|
||||
```nix
|
||||
pkgs.prettier.override {
|
||||
plugins = with pkgs.nodePackages; [
|
||||
prettier-plugin-toml
|
||||
# ...
|
||||
];
|
||||
}
|
||||
```
|
||||
*/
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
@@ -23,26 +9,6 @@
|
||||
plugins ? [ ],
|
||||
}:
|
||||
let
|
||||
/**
|
||||
# Example
|
||||
|
||||
```nix
|
||||
exportRelativePathOf (builtins.fromJSON "./package.json")
|
||||
=>
|
||||
lib/node_modules/prettier-plugin-toml/./lib/index.cjs
|
||||
```
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
exportRelativePathOf :: AttrSet => String
|
||||
```
|
||||
|
||||
# Arguments
|
||||
|
||||
packageJsonAttrs
|
||||
: Attribute set with shape similar to `package.json` file
|
||||
*/
|
||||
## Blame NodeJS
|
||||
exportRelativePathOf =
|
||||
let
|
||||
@@ -80,26 +46,6 @@ let
|
||||
lib.attrByPath [ "prettier" "plugins" ] [ "null" ] packageJsonAttrs
|
||||
)) packageJsonAttrs;
|
||||
|
||||
/**
|
||||
# Example
|
||||
|
||||
```nix
|
||||
nodeEntryPointOf pkgs.nodePackages.prettier-plugin-toml
|
||||
=>
|
||||
/nix/store/<NAR_HASH>-prettier-plugin-toml-<VERSION>/lib/node_modules/prettier-plugin-toml/./lib/index.cjs
|
||||
```
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
nodeEntryPointOf :: AttrSet => String
|
||||
```
|
||||
|
||||
# Arguments
|
||||
|
||||
plugin
|
||||
: Attribute set with `.pname` and `.outPath` defined
|
||||
*/
|
||||
nodeEntryPointOf =
|
||||
plugin:
|
||||
let
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
{ python3Packages }: with python3Packages; toPythonApplication pymcuprog
|
||||
@@ -8,16 +8,22 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "resterm";
|
||||
version = "0.21.3";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unkn0wn-root";
|
||||
repo = "resterm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-ix+9TblklF0PKzuSsI/qTqOH0la9K9wE84j/wJYJIM0=";
|
||||
sha256 = "sha256-ePWzD1y6UuNcM0nz1TaonUC83whhCg7kpO01xnpki5g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-E/Y4kW5xy7YamUP5bxFmDCAK6RqiqGN7DpEPG1MaCHc=";
|
||||
vendorHash = "sha256-q459U/zHaqaOwTlNtKc2hhpLWA8gMwIfwrmxThE3Ic4=";
|
||||
|
||||
# modernc.org/libc (via modernc.org/sqlite) tries to read /etc/protocols
|
||||
modPostBuild = ''
|
||||
substituteInPlace vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go \
|
||||
--replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)'
|
||||
'';
|
||||
|
||||
subPackages = [ "cmd/resterm" ];
|
||||
|
||||
|
||||
@@ -1,17 +1,23 @@
|
||||
{
|
||||
"@rollup/rollup-android-arm-eabi@npm:4.9.6": "0c2f9b26ec12048da21048a2005fb85b82918066eba3066fd55e1d3b3aaaa948d48e4a5bdaf01e783fc302cfd14248af305c2ab678e3601751dcc9cb34a90280",
|
||||
"@rollup/rollup-android-arm64@npm:4.9.6": "1e971371a8b472db35c43078c620d72a45807e005f7ba981cbc02f477c1871b670462860b8591f55c784fe4755812cb62449b52280e7727edd44030a5f722287",
|
||||
"@rollup/rollup-darwin-arm64@npm:4.9.6": "f0f3a11e6b1c9f86c1be8e6c349395713f01ad304ca698c27634132a06400d4caf76ab8d3b2e93ce42917c4bd1940ed0989565af57af9c3bba9af9afe13828a8",
|
||||
"@rollup/rollup-darwin-x64@npm:4.9.6": "aabb57c3e53c104ce9246f52293f3d6fa3593105e425da7e58b68e3f0e2b19c48cbcf1cdf6420e646297703bc2f07de4134cd456f3c98cb8a694c67c2e438b09",
|
||||
"@rollup/rollup-linux-arm-gnueabihf@npm:4.9.6": "f2279ec807463905bb37d417a4f460037fe464eba8cfc3b0e360dc681922ba7918986c0537adecb4c6f669e3c959fc557f90a83b4bf135a277163461282199fd",
|
||||
"@rollup/rollup-linux-arm64-gnu@npm:4.9.6": "628d62f3db2344f27b10d6efe0d0aae1f1215d3a1f69c36b76f7413afd87bdfd973efac38757c06348111047367acdb5027a49d720250846a4bf6591700728d3",
|
||||
"@rollup/rollup-linux-arm64-musl@npm:4.9.6": "deda2d49fa48dd5b128b5de1250646f9f1f6475ba2ea850989eb53b998caf7807a3b60d088650313ae7acacac5c275e10dbe6e45b652f66a8560f83c21ceb39b",
|
||||
"@rollup/rollup-linux-riscv64-gnu@npm:4.9.6": "f83d37dfc8626c3a39202ce395868bb7042c8213a0f0c05047ac90e83c734c3850e8047467d22517e0b069745d1f3a1963a8910c19ac1e332ad2a9ede7124642",
|
||||
"@rollup/rollup-linux-x64-gnu@npm:4.9.6": "422d2d719db0cc4aba06312102514ec84fa5f7b0a9899ea803275dd7562616e84ba2b022cc8816cb2d6378caa228f3de9d74658bb253e5071b41ea47d19e6f15",
|
||||
"@rollup/rollup-linux-x64-musl@npm:4.9.6": "9c4299965b36bb8a2b36c58039b9e3855d8dccaeb6514e498b4c55af89b2bda9e381e07739b860f3b63fc11395815cfe74abe636101efaaec3bad8182bba640f",
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.9.6": "4f5cb68d8ee166083e0c2d95f28823ca70031675953a776de929e4d65401eb1bc98e06c329c442a7a80250ddd4ec8da74af5610d6c6322143d16888bf2968145",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.9.6": "17aa37afe754006c6b5dce3191a2dcb9442694bac6c67457acaeb7397ca8029bb173c95aa8cef85a4d5a986a055807f217a46bcb09d0549f12c6d90bd8a1ad15",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.9.6": "9bf08c01d9da090f59de86904228990dbd74f2ade598d19f0684135acdb711f233cd532ab7ee96c7368a68c40942c8c34d868b83e3146ba97b20e8065dece8e0",
|
||||
"@rollup/rollup-android-arm-eabi@npm:4.32.1": "b017ace00bd6c6a7c4dba799cabb9ffd231a23b181aff1664b60aa95dcbb28845f980c61e0031eab23f00fa612b231576d1a1c7fe4ec68e5c3e1787fb1bdd03e",
|
||||
"@rollup/rollup-android-arm64@npm:4.32.1": "edcbb936fa8730598aa971f589f3413bd5148b8031c635a27ec9dd9415ef5a8257f6ef731d915aad0fbfcb5c5306d8ab135e09fefe0f876be198bd39466e1fdb",
|
||||
"@rollup/rollup-darwin-arm64@npm:4.32.1": "721985238c99bd45a2afc8d17906cfdb4b8e7d73cc8adc0d30da8488248030d9d8248e1bdf1088414a67dfe3af8945d664437cebf327363de5842563148887be",
|
||||
"@rollup/rollup-darwin-x64@npm:4.32.1": "dafe6ae9f41b1362bc0a40d7a9c65e769ddbc99a0f47420459b85eb35315016d8b2c7752491cceae9fba63a7b025bf9cba75fe0d7aeeb714c20adbe789d41836",
|
||||
"@rollup/rollup-freebsd-arm64@npm:4.32.1": "56b6addc09573afa9a4c2cdcf60d04f6a02a9fbad091c508390504cdcb5c8c2ac4fe5f57615e3808eb3ae95e0976a0f6058304d07918078ee6cdd1da51270532",
|
||||
"@rollup/rollup-freebsd-x64@npm:4.32.1": "8f0f96127a5011bdb94efbbb89c9cc1a2cb33bcd45501dd67f6615242be16d6e0fbb95a5827d4b81953755483565d8d8404e1edade20df1fadafda1e21842389",
|
||||
"@rollup/rollup-linux-arm-gnueabihf@npm:4.32.1": "2762a35b562ff48deaafb6fb2a3f3a61aeab9193ad404ac2f92c0c8c601aa7ec0e0419601cf45f3d76793b43bdd3497e63d98bc3fa410f6363f3dca37f08eb70",
|
||||
"@rollup/rollup-linux-arm-musleabihf@npm:4.32.1": "4ba13aa9a1ff86990a8aa13144942be97665d4cf657359c4d617f76dbf7d375ddf1e11531c74714997581645558df87d40b4e2e23d1d95ddf80909e529a6c2b9",
|
||||
"@rollup/rollup-linux-arm64-gnu@npm:4.32.1": "578a86aaa8ce61b1e9a3963c753752181b3ce360f00fb5eaa96ae4e48d62d994f7e2c69870781ded78d2ff530d9f03986c3145f19f657aa881222b8d13d0dc99",
|
||||
"@rollup/rollup-linux-arm64-musl@npm:4.32.1": "0800cced8692a3a0c48dfcc05b4ccd731ba288eb2bcfad680ea2a8272b31667c3bcabe3782d809bc9480a052144d6a6e91a7fa2584aded1fcd46ff81a5ec26ee",
|
||||
"@rollup/rollup-linux-loongarch64-gnu@npm:4.32.1": "7bff2363b2d00d264f0001cd510b41eb1b6ceabe000a211871931e04d15983b44bf4b58eb87c61b007c278caff45178bdda596d08c5a2e281a76945a0f4eadd4",
|
||||
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.32.1": "0a86e6510f176d5e156bd2c77fbca2ab182289b54513ef5d450d308e1c1f144c94474d34c11a9f52be10512e92fe2f5239dc984914eaafd76cf96fd625b4f9ef",
|
||||
"@rollup/rollup-linux-riscv64-gnu@npm:4.32.1": "1c1daef81116da736228a921abe935f3d7398c5f7f78aeeef9171f237c2ece162cb3adedb618a57739ec43cce111a24985aa776a5d802b09be46f341d9878c29",
|
||||
"@rollup/rollup-linux-s390x-gnu@npm:4.32.1": "50974fbbd591a744ad5a6c240777fe7b96d1fc8827546655d38cfc3a764cd1a4491e2c012b949c8fd78d48b8000b91d0ec8b649299eaf26bba99564a20ca519c",
|
||||
"@rollup/rollup-linux-x64-gnu@npm:4.32.1": "cadcff5dd0e7d01ac30043e4ce9df81e308c14b7eab1de65e59f114d08c122d76c15b20b9677686c0b6061691bcc13aa835c488c504d6f8c782330cb7db81afe",
|
||||
"@rollup/rollup-linux-x64-musl@npm:4.32.1": "415b177b762909cd04af0277118c798e02f979ff86e84c8b4d65bc70323d8e221aff9c0c7d904221bd6338515fe0223b8d59610728dfcfc42c4dac864f9d0829",
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.32.1": "0a86e7b0bd7d80b01c6850c27ba5c8ad52d17ae98069b0741c074ef796285735da2a0bd936e347078c344e569d288ba84a188414163bf67979764e1b532873d1",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.32.1": "e7076720071ba1020906a4ded867069bf20b48b44f2623f52eb06c006d1884aeebd05407f7b758375dc3ce351267c53185745de51fdb1593ec1302527b9b54ce",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.32.1": "a49e24d28b1ec5a07b75ae9a23ffb3542300b094a057dc5b57bd4923670a90fb8ba093fe4d3e07a78d6712a9fa20c21289cf5e4a67e7d0e513111053dc807ae2",
|
||||
"dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
|
||||
"iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0"
|
||||
}
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
yarn-berry,
|
||||
yarn-berry_4,
|
||||
nodejs,
|
||||
pkg-config,
|
||||
node-gyp,
|
||||
python3Packages,
|
||||
electron_39,
|
||||
electron_40,
|
||||
vips,
|
||||
xvfb-run,
|
||||
copyDesktopItems,
|
||||
@@ -16,17 +16,18 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
electron = electron_39;
|
||||
yarn-berry = yarn-berry_4;
|
||||
electron = electron_40;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "4.11.2";
|
||||
version = "4.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RocketChat";
|
||||
repo = "Rocket.Chat.Electron";
|
||||
tag = version;
|
||||
hash = "sha256-GTeRrj2zcu36h4z7zPLIYy0pEk94QejTi+6/e3r8XW8=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/IzIvPgm18YXSq5RUBXdWsMk45jEs15qkPCnKeMW+E4=";
|
||||
};
|
||||
|
||||
# This might need to be updated between releases.
|
||||
@@ -34,8 +35,8 @@ stdenv.mkDerivation rec {
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit src missingHashes;
|
||||
hash = "sha256-ZAb8zDdxsJYRD6LRhtFS8XRc8NbstJbUyaQCbvSdKSg=";
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-3j1lydMNR3kI+G49Sz+LZ2YhwMQWcwKAn09ao4ur0oc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -140,9 +141,9 @@ stdenv.mkDerivation rec {
|
||||
description = "Official Desktop client for Rocket.Chat";
|
||||
mainProgram = "rocketchat-desktop";
|
||||
homepage = "https://github.com/RocketChat/Rocket.Chat.Electron";
|
||||
changelog = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mynacol ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swayrbar";
|
||||
version = "0.4.2";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~tsdh";
|
||||
repo = "swayr";
|
||||
rev = "swayrbar-${version}";
|
||||
sha256 = "sha256-qfk4yqJkqTiFKFZXCVPPZM0g0/+A8d8fDeat9ZsfokI=";
|
||||
tag = "swayrbar-${version}";
|
||||
sha256 = "sha256-uT8MYgH9kANQ0t+7jqjOOvQIZf5ImdQruZLLlCejwcc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rByw6l/4CATEIDS5h1owGCr1x8Qt4+lzabLwni7PYMc=";
|
||||
cargoHash = "sha256-Aj4U2xyfNhf3HDSEd1SQ5TyO2MXn2/hrfnG0ZayzMtU=";
|
||||
|
||||
# don't build swayr
|
||||
buildAndTestSubdir = pname;
|
||||
@@ -37,9 +37,10 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Status command for sway's swaybar implementing the swaybar-protocol";
|
||||
homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara";
|
||||
changelog = "https://git.sr.ht/~tsdh/swayr/tree/main/item/swayrbar/NEWS.md";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ ilkecan ];
|
||||
mainProgram = "swayrbar";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{
|
||||
buildGoModule,
|
||||
buildGo126Module,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
# doubles the binary size
|
||||
withPprof ? false,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "swgp-go";
|
||||
version = "1.8.0-0-unstable-2026-01-24";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "database64128";
|
||||
repo = "swgp-go";
|
||||
rev = "12be9c3ac0ea2c39b167cde708192935f7263a76";
|
||||
hash = "sha256-0W7yioZc86xfjrJKeCAPT4mLWyrQDaBa9QbGjrR/Tpc=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GnWcpAXViyO0T9u/AwVPr0SxvohuX+60C8j2kZbyKD0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ghv5FwSPQSUFQ1t2zWTXpFggCA4/qrQmnVYkYBF8AQ4=";
|
||||
vendorHash = "sha256-qiFFXL2nFZhsUsAZ98FRS2kF4ROaQUat5Skceh1DWaQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -41,4 +41,4 @@ buildGoModule {
|
||||
];
|
||||
mainProgram = "swgp-go";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -62,7 +62,7 @@ let
|
||||
stdenv.cc.cc
|
||||
stdenv.cc.libc
|
||||
];
|
||||
version = "1.509.0";
|
||||
version = "1.510.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "tana";
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
|
||||
hash = "sha256-zjFMF46a/aHxNbbAfuvmX8CFxcy5Q8cajultHuBi3Ew=";
|
||||
hash = "sha256-EMrcQuMbVBdX/HaDixMwBjRBS5cL+123JEu0S7ZjRas=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,7 +21,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
|
||||
python3Packages.buildPythonApplication
|
||||
(finalAttrs: {
|
||||
pname = "tuifimanager";
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -29,7 +29,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
|
||||
owner = "GiorgosXou";
|
||||
repo = "TUIFIManager";
|
||||
tag = "v.${finalAttrs.version}";
|
||||
hash = "sha256-in9gACM8AxodecQZX0QzY+hdADd7SIcDyXMfTt8LPJk=";
|
||||
hash = "sha256-cN1I/bCOO2YdxdHGNVbDDH1+P1q+tU3gbEeQjl8jmNI=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "uptime-kuma";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "louislam";
|
||||
repo = "uptime-kuma";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9wgrzZrog5QMx6vnQ+kIP4pkQdvQo1QSxGZav2ikNRY=";
|
||||
hash = "sha256-1zTZCTT2UzdhZ8UBYdlnC8/nwpa/M459+X05rk1rb4U=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-r3QkAE1Bm2rh+h/4dpqj6c8yldcH3J1/38JYXcVV80o=";
|
||||
npmDepsHash = "sha256-fazB+iyOjTgp+chDFCQpPGmLgNGKIPnmoLyG7CYiiUk=";
|
||||
|
||||
patches = [
|
||||
# Fixes the permissions of the database being not set correctly
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-axes";
|
||||
version = "8.2.0";
|
||||
version = "8.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "django-axes";
|
||||
tag = version;
|
||||
hash = "sha256-obh137DbFkkSodR67hWRzQg8wHXsFdT3NDnxDg/jmR0=";
|
||||
hash = "sha256-DcoKXNldTXNcJTauI1torupjnKNvqmTo4/BbFXBZyFA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -23,19 +23,19 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llguidance";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guidance-ai";
|
||||
repo = "llguidance";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dLX01+8R6SbirFda10dufhMxARSVIXj2y8xIj95Od7A=";
|
||||
hash = "sha256-z6idcnLyrjTo6p/Vk7yjk8q0XYn5tCJz4GsNrWb0UYk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src pname version;
|
||||
hash = "sha256-fmQ+A6spWUR0bY5LG+MGW9uTFmYJPQjx8tGxkFXttgc=";
|
||||
hash = "sha256-R8gX53RWrbo295/wXTZOWBpwSvyR5OqCWZhEf/E6LlE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
@@ -51,22 +49,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "papis";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "fix-support-new-click-in-papisrunner.patch";
|
||||
url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1";
|
||||
hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU=";
|
||||
})
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "papis";
|
||||
repo = "papis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-V4YswLNYwfBYe/Td0PEeDG++ClZoF08yxXjUXuyppPI=";
|
||||
hash = "sha256-G+ryUMBUEbGxUG+u2YwZbT04IAzOmajtIPXP12MaXsY=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -129,6 +119,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
disabledTests = [
|
||||
# Require network access
|
||||
"test_add_folder_name_cli"
|
||||
"test_add_link_cli"
|
||||
"test_get_matching_importers_by_name"
|
||||
"test_matching_importers_by_uri"
|
||||
"test_yaml_unicode_dump"
|
||||
# FileNotFoundError: Command not found: 'init'
|
||||
"test_git_cli"
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
cython,
|
||||
hidapi,
|
||||
pyserial,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
mock,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "pyedbglib";
|
||||
version = "2.24.2.18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microchip-pic-avr-tools";
|
||||
repo = "pyedbglib";
|
||||
# the repo currently does not tag releases, so using the
|
||||
# commit ID for now
|
||||
rev = "9bbeceba942772ef31b9c059b761460a782313e";
|
||||
hash = "sha256-iZB/+JEBy5n1zfajmJmEqRVQ2hPzJD/U85SvmyFiGhc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
cython
|
||||
hidapi
|
||||
pyserial
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyedbglib" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Low-level protocol library for communicating with Microchip CMSIS-DAP based debuggers";
|
||||
homepage = "https://github.com/microchip-pic-avr-tools/pyedbglib";
|
||||
changelog = "https://github.com/microchip-pic-avr-tools/pyedbglib/blob/main/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ prophetofxenu ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
appdirs,
|
||||
intelhex,
|
||||
pyedbglib,
|
||||
pyserial,
|
||||
pyyaml,
|
||||
|
||||
# tests
|
||||
mock,
|
||||
parameterized,
|
||||
pytestCheckHook,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "pymcuprog";
|
||||
version = "3.19.4.61";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microchip-pic-avr-tools";
|
||||
repo = "pymcuprog";
|
||||
# the repo currently does not tag releases, so using the
|
||||
# commit ID for now
|
||||
rev = "e2fa9a7f0b9cc413367c51b9ccf19d93cdca6c8";
|
||||
hash = "sha256-RmFGQ6LbuwwM/WHr01nYGZYoWG7Qbasz/TL4r8l1NUk";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
appdirs
|
||||
intelhex
|
||||
pyedbglib
|
||||
pyserial
|
||||
pyyaml
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pymcuprog" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
parameterized
|
||||
pytestCheckHook
|
||||
versionCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
versionCheckKeepEnvironment = "HOME";
|
||||
|
||||
meta = {
|
||||
description = "Python utility for programming various Microchip MCU devices using Microchip CMSIS-DAP based debuggers";
|
||||
mainProgram = "pymcuprog";
|
||||
homepage = "https://github.com/microchip-pic-avr-tools/pymcuprog";
|
||||
changelog = "https://github.com/microchip-pic-avr-tools/pymcuprog/blob/main/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ prophetofxenu ];
|
||||
};
|
||||
}
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.12.68";
|
||||
hash = "sha256-HCBSAEyLZeHufBj+TCTzdv6NBvWZGUknAAQ2eWK/Tmw=";
|
||||
version = "6.12.70";
|
||||
hash = "sha256-Azhv4au48TQbhGsngPvY8Uue71K9KQuJyqcYrM655xM=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "6.18.8";
|
||||
hash = "sha256-BagAixl3Eo9vX6F/vpQv8OCw5vm8l7JtZBqvE0m5gAs=";
|
||||
version = "6.18.10";
|
||||
hash = "sha256-bYKYx9ctHuWG+WS/Wtt4p2uW6vy2g5ikLqSPWeNeSn0=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@ let
|
||||
variants = {
|
||||
# ./update-zen.py zen
|
||||
zen = {
|
||||
version = "6.18.7"; # zen
|
||||
version = "6.18.9"; # zen
|
||||
suffix = "zen1"; # zen
|
||||
sha256 = "0in7n00g4rq0yiy3gxaymxh33v8g3f147jypylmn998lhs7y3d68"; # zen
|
||||
sha256 = "1kwb5lbm3y7nhsyx18fhpc3852v76lyl74008rjai9shr3p4zp40"; # zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
|
||||
@@ -13428,6 +13428,8 @@ self: super: with self; {
|
||||
|
||||
pyecowitt = callPackage ../development/python-modules/pyecowitt { };
|
||||
|
||||
pyedbglib = callPackage ../development/python-modules/pyedbglib { };
|
||||
|
||||
pyedflib = callPackage ../development/python-modules/pyedflib { };
|
||||
|
||||
pyedimax = callPackage ../development/python-modules/pyedimax { };
|
||||
@@ -13976,6 +13978,8 @@ self: super: with self; {
|
||||
|
||||
pymc = callPackage ../development/python-modules/pymc { };
|
||||
|
||||
pymcuprog = callPackage ../development/python-modules/pymcuprog { };
|
||||
|
||||
pymdown-extensions = callPackage ../development/python-modules/pymdown-extensions { };
|
||||
|
||||
pymdstat = callPackage ../development/python-modules/pymdstat { };
|
||||
|
||||
Reference in New Issue
Block a user