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

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-08-07 18:07:03 +00:00
committed by GitHub
parent 903ade7b09 8cae5243fb
commit e24112b607
65 changed files with 1168 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/labeler.yml
+1
View File
@@ -28,6 +28,7 @@
- nixos/modules/services/x11/desktop-managers/cinnamon.nix
- nixos/tests/cinnamon.nix
- nixos/tests/cinnamon-wayland.nix
- pkgs/by-name/ci/cinnamon/**/*
- pkgs/by-name/ci/cinnamon-*/**/*
- pkgs/by-name/cj/cjs/**/*
- pkgs/by-name/mu/muffin/**/*
maintainers/maintainer-list.nix
+6
View File
@@ -5966,6 +5966,12 @@
githubId = 58050402;
name = "Jost Alemann";
};
DDoSolitary = {
email = "DDoSolitary@gmail.com";
github = "DDoSolitary";
githubId = 25856103;
name = "DDoSolitary";
};
dduan = {
email = "daniel@duan.ca";
github = "dduan";
nixos/doc/manual/release-notes/rl-2511.section.md
+2
View File
@@ -161,6 +161,8 @@
- `services.dnscrypt-proxy2` gains a `package` option to specify dnscrypt-proxy package to use.
- `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.
- `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.
- `libvirt` now supports using `nftables` backend.
nixos/modules/services/networking/dnsmasq.nix
+1 -1
View File
@@ -179,7 +179,7 @@ in
touch ${stateDir}/dnsmasq.leases
chown -R dnsmasq ${stateDir}
${lib.optionalString cfg.resolveLocalQueries "touch /etc/dnsmasq-{conf,resolv}.conf"}
dnsmasq --test
dnsmasq --test -C ${cfg.configFile}
'';
serviceConfig = {
Type = "dbus";
nixos/modules/services/networking/tailscale-derper.nix
+5 -4
View File
@@ -82,10 +82,11 @@ in
locations."/" = {
proxyPass = "http://127.0.0.1:${toString cfg.port}";
proxyWebsockets = true;
extraConfig = ''
keepalive_timeout 0;
proxy_buffering off;
'';
extraConfig = # nginx
''
proxy_buffering off;
proxy_read_timeout 3600s;
'';
};
};
};
nixos/modules/services/web-apps/nextcloud.nix
+5 -2
View File
@@ -772,11 +772,14 @@ in
configureRedis = lib.mkOption {
type = lib.types.bool;
default = config.services.nextcloud.notify_push.enable;
defaultText = lib.literalExpression "config.services.nextcloud.notify_push.enable";
default = true;
description = ''
Whether to configure Nextcloud to use the recommended Redis settings for small instances.
::: {.note}
The Nextcloud system check recommends to configure either Redis or Memcache for file lock caching.
:::
::: {.note}
The `notify_push` app requires Redis to be configured. If this option is turned off, this must be configured manually.
:::
nixos/modules/services/x11/desktop-managers/cinnamon.nix
+5 -5
View File
@@ -66,7 +66,7 @@ in
config = mkMerge [
(mkIf cfg.enable {
services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
services.displayManager.sessionPackages = [ pkgs.cinnamon ];
services.xserver.displayManager.lightdm.greeters.slick = {
enable = mkDefault true;
@@ -114,7 +114,7 @@ in
services.accounts-daemon.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.dbus.packages = with pkgs; [
cinnamon-common
cinnamon
cinnamon-screensaver
nemo-with-extensions
xapp
@@ -166,7 +166,7 @@ in
desktop-file-utils
# common-files
cinnamon-common
cinnamon
cinnamon-session
cinnamon-desktop
cinnamon-menus
@@ -177,7 +177,7 @@ in
# session requirements
cinnamon-screensaver
# cinnamon-killer-daemon: provided by cinnamon-common
# cinnamon-killer-daemon: provided by cinnamon
networkmanagerapplet # session requirement - also nm-applet not needed
# packages
@@ -225,7 +225,7 @@ in
services.orca.enable = mkDefault (notExcluded pkgs.orca);
xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
xdg.portal.configPackages = mkDefault [ pkgs.cinnamon ];
# Override GSettings schemas
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
nixos/tests/nextcloud/with-mysql-and-memcached.nix
+1 -1
View File
@@ -23,10 +23,10 @@ runTest (
services.nextcloud = {
caching = {
apcu = true;
redis = false;
memcached = true;
};
config.dbtype = "mysql";
configureRedis = false;
};
services.memcached.enable = true;
pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "dosbox-pure";
version = "0-unstable-2025-07-28";
version = "0-unstable-2025-08-03";
src = fetchFromGitHub {
owner = "schellingb";
repo = "dosbox-pure";
rev = "4b5f6c964aa56357e19632bf73d1875c2496fdd1";
hash = "sha256-J1NSt2Q4+lWUVqROv5yAM/rXI5COl0FRux3xqFLw20g=";
rev = "935b33b892b55ab5e12a093795a6563af9eacb78";
hash = "sha256-19ehYyVOnYg3b1cvuznYn3zB9rhp2xULKhdFN/FKE4U=";
};
hardeningDisable = [ "format" ];
pkgs/applications/emulators/libretro/cores/fmsx.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fmsx";
version = "0-unstable-2024-10-21";
version = "0-unstable-2025-07-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "fmsx-libretro";
rev = "9eb5f25df5397212a3e3088ca1a64db0740bbe5f";
hash = "sha256-Pac1tQvPxYETU+fYU17moBHGfjNtzZiOsOms1uFQAmE=";
rev = "fbe4dfc4c3e3f7eb27089def3d663a905b181845";
hash = "sha256-1hZQO16SDB8n1wdTP67Kpns3izg/nPGl5M7wjFDBjGc=";
};
makefile = "Makefile";
pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+397 -397
View File
File diff suppressed because it is too large Load Diff
pkgs/build-support/dotnet/build-dotnet-module/default.nix
+2 -12
View File
@@ -98,13 +98,7 @@ let
else
dotnet-sdk.meta.platforms;
inherit (callPackage ./hooks { inherit dotnet-sdk dotnet-runtime; })
dotnetConfigureHook
dotnetBuildHook
dotnetCheckHook
dotnetInstallHook
dotnetFixupHook
;
hook = callPackage ./hook { inherit dotnet-runtime; };
inherit (dotnetCorePackages) systemToDotnetRid;
in
@@ -140,11 +134,7 @@ let
;
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
dotnetConfigureHook
dotnetBuildHook
dotnetCheckHook
dotnetInstallHook
dotnetFixupHook
hook
cacert
makeWrapper
pkgs/build-support/dotnet/build-dotnet-module/hook/default.nix
+18
View File
@@ -0,0 +1,18 @@
{
lib,
which,
coreutils,
makeSetupHook,
# Passed from ../default.nix
dotnet-runtime,
}:
makeSetupHook {
name = "dotnet-hook";
substitutions = {
dotnetRuntime = dotnet-runtime;
wrapperPath = lib.makeBinPath [
which
coreutils
];
};
} ./dotnet-hook.sh
pkgs/build-support/dotnet/build-dotnet-module/hook/dotnet-hook.sh
+426
View File
@@ -0,0 +1,426 @@
# shellcheck shell=bash
dotnetConfigurePhase() {
echo "Executing dotnetConfigureHook"
runHook preConfigure
local -a projectFiles flags runtimeIds
concatTo projectFiles dotnetProjectFiles dotnetTestProjectFiles
concatTo flags dotnetFlags dotnetRestoreFlags
concatTo runtimeIds dotnetRuntimeIds
if [[ -z ${enableParallelBuilding-} ]]; then
flags+=(--disable-parallel)
fi
if [[ -v dotnetSelfContainedBuild ]]; then
if [[ -n $dotnetSelfContainedBuild ]]; then
flags+=("-p:SelfContained=true")
else
flags+=("-p:SelfContained=false")
fi
fi
dotnetRestore() {
local -r projectFile="${1-}"
for runtimeId in "${runtimeIds[@]}"; do
dotnet restore ${1+"$projectFile"} \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:NuGetAudit=false \
--runtime "$runtimeId" \
"${flags[@]}"
done
}
if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then
dotnet tool restore
fi
# dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but
# avoid other project-specific logic. This is a hack, but the old behavior
# is worse as it relied on a bug: setting projectFile to an empty string
# made the hooks actually skip all project-specific logic. It’s hard to keep
# backwards compatibility with this odd behavior now since we are using
# arrays, so instead we just pass a variable to indicate that we don’t have
# projects.
if [[ -z ${dotnetGlobalTool-} ]]; then
if (( ${#projectFiles[@]} == 0 )); then
dotnetRestore
fi
local projectFile
for projectFile in "${projectFiles[@]}"; do
dotnetRestore "$projectFile"
done
fi
runHook postConfigure
echo "Finished dotnetConfigureHook"
}
if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then
configurePhase=dotnetConfigurePhase
fi
dotnetBuildPhase() {
echo "Executing dotnetBuildHook"
runHook preBuild
local -r dotnetBuildType="${dotnetBuildType-Release}"
local -a projectFiles flags runtimeIds
concatTo projectFiles dotnetProjectFiles dotnetTestProjectFiles
concatTo flags dotnetFlags dotnetBuildFlags
concatTo runtimeIds dotnetRuntimeIds
if [[ -n "${enableParallelBuilding-}" ]]; then
local -r maxCpuFlag="$NIX_BUILD_CORES"
local -r parallelBuildFlag="true"
else
local -r maxCpuFlag="1"
local -r parallelBuildFlag="false"
fi
if [[ -v dotnetSelfContainedBuild ]]; then
if [[ -n $dotnetSelfContainedBuild ]]; then
flags+=("-p:SelfContained=true")
else
flags+=("-p:SelfContained=false")
fi
fi
if [[ -n ${dotnetUseAppHost-} ]]; then
flags+=("-p:UseAppHost=true")
fi
if [[ -n ${version-} ]]; then
flags+=("-p:InformationalVersion=$version")
fi
if [[ -n ${versionForDotnet-} ]]; then
flags+=("-p:Version=$versionForDotnet")
fi
dotnetBuild() {
local -r projectFile="${1-}"
for runtimeId in "${runtimeIds[@]}"; do
local runtimeIdFlags=()
if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
runtimeIdFlags+=("--runtime" "$runtimeId")
fi
dotnet build ${1+"$projectFile"} \
-maxcpucount:"$maxCpuFlag" \
-p:BuildInParallel="$parallelBuildFlag" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:OverwriteReadOnlyFiles=true \
--configuration "$dotnetBuildType" \
--no-restore \
"${runtimeIdFlags[@]}" \
"${flags[@]}"
done
}
if (( ${#projectFiles[@]} == 0 )); then
dotnetBuild
fi
local projectFile
for projectFile in "${projectFiles[@]}"; do
dotnetBuild "$projectFile"
done
runHook postBuild
echo "Finished dotnetBuildHook"
}
if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then
buildPhase=dotnetBuildPhase
fi
dotnetCheckPhase() {
echo "Executing dotnetCheckHook"
runHook preCheck
local -r dotnetBuildType="${dotnetBuildType-Release}"
local -a projectFiles testProjectFiles testFilters disabledTests flags runtimeIds runtimeDeps
concatTo projectFiles dotnetProjectFiles
concatTo testProjectFiles dotnetTestProjectFiles
concatTo testFilters dotnetTestFilters
concatTo disabledTests dotnetDisabledTests
concatTo flags dotnetFlags dotnetTestFlags
concatTo runtimeIds dotnetRuntimeIds
concatTo runtimeDeps dotnetRuntimeDeps
if (( ${#disabledTests[@]} > 0 )); then
local disabledTestsFilters=("${disabledTests[@]/#/FullyQualifiedName!=}")
testFilters=( "${testFilters[@]}" "${disabledTestsFilters[@]//,/%2C}" )
fi
if (( ${#testFilters[@]} > 0 )); then
local OLDIFS="$IFS" IFS='&'
flags+=("--filter:${testFilters[*]}")
IFS="$OLDIFS"
fi
local libraryPath="${LD_LIBRARY_PATH-}"
if (( ${#runtimeDeps[@]} > 0 )); then
local libraryPaths=("${runtimeDeps[@]/%//lib}")
local OLDIFS="$IFS" IFS=':'
libraryPath="${libraryPaths[*]}${libraryPath:+':'}$libraryPath"
IFS="$OLDIFS"
fi
if [[ -n ${enableParallelBuilding-} ]]; then
local -r maxCpuFlag="$NIX_BUILD_CORES"
else
local -r maxCpuFlag="1"
fi
local projectFile runtimeId
for projectFile in "${testProjectFiles[@]-${projectFiles[@]}}"; do
for runtimeId in "${runtimeIds[@]}"; do
local runtimeIdFlags=()
if [[ $projectFile == *.csproj ]]; then
runtimeIdFlags=("--runtime" "$runtimeId")
fi
LD_LIBRARY_PATH=$libraryPath \
dotnet test "$projectFile" \
-maxcpucount:"$maxCpuFlag" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
--configuration "$dotnetBuildType" \
--no-restore \
--no-build \
--logger "console;verbosity=normal" \
"${runtimeIdFlags[@]}" \
"${flags[@]}"
done
done
runHook postCheck
echo "Finished dotnetCheckHook"
}
if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then
checkPhase=dotnetCheckPhase
fi
# For compatibility, convert makeWrapperArgs to an array unless we are using
# structured attributes. That is, we ensure that makeWrapperArgs is always an
# array.
# See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3
# and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920
# shellcheck disable=2206
if [[ -z $__structuredAttrs ]]; then
makeWrapperArgs=( ${makeWrapperArgs-} )
fi
# First argument is the executable you want to wrap,
# the second is the destination for the wrapper.
wrapDotnetProgram() {
local -r dotnetRuntime=@dotnetRuntime@
local -r wrapperPath=@wrapperPath@
# shellcheck disable=2016
local -r dotnetFromEnvScript='dotnetFromEnv() {
local dotnetPath
if command -v dotnet 2>&1 >/dev/null; then
dotnetPath=$(which dotnet) && \
dotnetPath=$(realpath "$dotnetPath") && \
dotnetPath=$(dirname "$dotnetPath") && \
export DOTNET_ROOT="$dotnetPath"
fi
}
dotnetFromEnv'
# shellcheck disable=2206
local -a runtimeDeps
concatTo runtimeDeps dotnetRuntimeDeps
local wrapperFlags=()
if (( ${#runtimeDeps[@]} > 0 )); then
local libraryPath=("${dotnetRuntimeDeps[@]/%//lib}")
local OLDIFS="$IFS" IFS=':'
wrapperFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPath[*]}")
IFS="$OLDIFS"
fi
if [[ -z ${dotnetSelfContainedBuild-} ]]; then
if [[ -n ${useDotnetFromEnv-} ]]; then
# if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
wrapperFlags+=("--suffix" "PATH" ":" "$wrapperPath")
wrapperFlags+=("--run" "$dotnetFromEnvScript")
if [[ -n $dotnetRuntime ]]; then
wrapperFlags+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
wrapperFlags+=("--suffix" "PATH" ":" "$dotnetRuntime/bin")
fi
elif [[ -n $dotnetRuntime ]]; then
wrapperFlags+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
wrapperFlags+=("--prefix" "PATH" ":" "$dotnetRuntime/bin")
fi
fi
# shellcheck disable=2154
makeWrapper "$1" "$2" \
"${wrapperFlags[@]}" \
"${gappsWrapperArgs[@]}" \
"${makeWrapperArgs[@]}"
echo "installed wrapper to $2"
}
dotnetFixupPhase() {
local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
local executable executableBasename
# check if dotnetExecutables is declared (including empty values, in which case we generate no executables)
# shellcheck disable=2154
if declare -p dotnetExecutables &>/dev/null; then
# shellcheck disable=2206
local -a executables
concatTo executables dotnetExecutables
for executable in "${executables[@]}"; do
executableBasename=$(basename "$executable")
local path="$dotnetInstallPath/$executable"
if test -x "$path"; then
wrapDotnetProgram "$path" "$out/bin/$executableBasename"
else
echo "Specified binary \"$executable\" is either not an executable or does not exist!"
echo "Looked in $path"
exit 1
fi
done
else
while IFS= read -r -d '' executable; do
executableBasename=$(basename "$executable")
wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \;
done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0)
fi
}
if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then
appendToVar preFixupPhases dotnetFixupPhase
fi
dotnetInstallPhase() {
echo "Executing dotnetInstallHook"
runHook preInstall
local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
local -r dotnetBuildType="${dotnetBuildType-Release}"
local -a projectFiles flags installFlags packFlags runtimeIds
concatTo projectFiles dotnetProjectFiles
concatTo flags dotnetFlags
concatTo installFlags dotnetInstallFlags
concatTo packFlags dotnetPackFlags
concatTo runtimeIds dotnetRuntimeIds
if [[ -v dotnetSelfContainedBuild ]]; then
if [[ -n $dotnetSelfContainedBuild ]]; then
installFlags+=("--self-contained")
else
installFlags+=("--no-self-contained")
# https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained
# Trimming is only available for self-contained build, so force disable it here
installFlags+=("-p:PublishTrimmed=false")
fi
fi
if [[ -n ${dotnetUseAppHost-} ]]; then
installFlags+=("-p:UseAppHost=true")
fi
if [[ -n ${enableParallelBuilding-} ]]; then
local -r maxCpuFlag="$NIX_BUILD_CORES"
else
local -r maxCpuFlag="1"
fi
dotnetPublish() {
local -r projectFile="${1-}"
for runtimeId in "${runtimeIds[@]}"; do
runtimeIdFlags=()
if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
runtimeIdFlags+=("--runtime" "$runtimeId")
fi
dotnet publish ${1+"$projectFile"} \
-maxcpucount:"$maxCpuFlag" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:OverwriteReadOnlyFiles=true \
--output "$dotnetInstallPath" \
--configuration "$dotnetBuildType" \
--no-restore \
--no-build \
"${runtimeIdFlags[@]}" \
"${flags[@]}" \
"${installFlags[@]}"
done
}
dotnetPack() {
local -r projectFile="${1-}"
for runtimeId in "${runtimeIds[@]}"; do
dotnet pack ${1+"$projectFile"} \
-maxcpucount:"$maxCpuFlag" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:OverwriteReadOnlyFiles=true \
--output "$out/share/nuget/source" \
--configuration "$dotnetBuildType" \
--no-restore \
--no-build \
--runtime "$runtimeId" \
"${flags[@]}" \
"${packFlags[@]}"
done
}
if (( ${#projectFiles[@]} == 0 )); then
dotnetPublish
else
local projectFile
for projectFile in "${projectFiles[@]}"; do
dotnetPublish "$projectFile"
done
fi
if [[ -n ${packNupkg-} ]]; then
if (( ${#projectFiles[@]} == 0 )); then
dotnetPack
else
local projectFile
for projectFile in "${projectFiles[@]}"; do
dotnetPack "$projectFile"
done
fi
fi
runHook postInstall
echo "Finished dotnetInstallHook"
}
if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then
installPhase=dotnetInstallPhase
fi
pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix
-54
View File
@@ -1,54 +0,0 @@
{
lib,
stdenv,
which,
coreutils,
zlib,
openssl,
makeSetupHook,
zip,
# Passed from ../default.nix
dotnet-sdk,
dotnet-runtime,
}:
{
dotnetConfigureHook = makeSetupHook {
name = "dotnet-configure-hook";
substitutions = {
dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker";
libPath = lib.makeLibraryPath [
stdenv.cc.cc
stdenv.cc.libc
dotnet-sdk.passthru.icu
zlib
openssl
];
};
} ./dotnet-configure-hook.sh;
dotnetBuildHook = makeSetupHook {
name = "dotnet-build-hook";
} ./dotnet-build-hook.sh;
dotnetCheckHook = makeSetupHook {
name = "dotnet-check-hook";
} ./dotnet-check-hook.sh;
dotnetInstallHook = makeSetupHook {
name = "dotnet-install-hook";
substitutions = {
inherit zip;
};
} ./dotnet-install-hook.sh;
dotnetFixupHook = makeSetupHook {
name = "dotnet-fixup-hook";
substitutions = {
dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null;
wrapperPath = lib.makeBinPath [
which
coreutils
];
};
} ./dotnet-fixup-hook.sh;
}
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh
-91
View File
@@ -1,91 +0,0 @@
dotnetBuildHook() {
echo "Executing dotnetBuildHook"
runHook preBuild
local -r dotnetBuildType="${dotnetBuildType-Release}"
if [[ -n $__structuredAttrs ]]; then
local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
local dotnetFlagsArray=( "${dotnetFlags[@]}" )
local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" )
local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
else
local dotnetProjectFilesArray=($dotnetProjectFiles)
local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
local dotnetFlagsArray=($dotnetFlags)
local dotnetBuildFlagsArray=($dotnetBuildFlags)
local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
fi
if [[ -n "${enableParallelBuilding-}" ]]; then
local -r maxCpuFlag="$NIX_BUILD_CORES"
local -r parallelBuildFlag="true"
else
local -r maxCpuFlag="1"
local -r parallelBuildFlag="false"
fi
if [[ -v dotnetSelfContainedBuild ]]; then
if [[ -n $dotnetSelfContainedBuild ]]; then
dotnetBuildFlagsArray+=("-p:SelfContained=true")
else
dotnetBuildFlagsArray+=("-p:SelfContained=false")
fi
fi
if [[ -n ${dotnetUseAppHost-} ]]; then
dotnetBuildFlagsArray+=("-p:UseAppHost=true")
fi
local versionFlagsArray=()
if [[ -n ${version-} ]]; then
versionFlagsArray+=("-p:InformationalVersion=$version")
fi
if [[ -n ${versionForDotnet-} ]]; then
versionFlagsArray+=("-p:Version=$versionForDotnet")
fi
dotnetBuild() {
local -r projectFile="${1-}"
for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
local runtimeIdFlagsArray=()
if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
runtimeIdFlagsArray+=("--runtime" "$runtimeId")
fi
dotnet build ${1+"$projectFile"} \
-maxcpucount:"$maxCpuFlag" \
-p:BuildInParallel="$parallelBuildFlag" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:OverwriteReadOnlyFiles=true \
--configuration "$dotnetBuildType" \
--no-restore \
"${versionFlagsArray[@]}" \
"${runtimeIdFlagsArray[@]}" \
"${dotnetBuildFlagsArray[@]}" \
"${dotnetFlagsArray[@]}"
done
}
if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
dotnetBuild
fi
local projectFile
for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
dotnetBuild "$projectFile"
done
runHook postBuild
echo "Finished dotnetBuildHook"
}
if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then
buildPhase=dotnetBuildHook
fi
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh
-81
View File
@@ -1,81 +0,0 @@
dotnetCheckHook() {
echo "Executing dotnetCheckHook"
runHook preCheck
local -r dotnetBuildType="${dotnetBuildType-Release}"
if [[ -n $__structuredAttrs ]]; then
local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" )
local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" )
local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" )
local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
else
local dotnetProjectFilesArray=($dotnetProjectFiles)
local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
local dotnetTestFlagsArray=($dotnetTestFlags)
local dotnetTestFiltersArray=($dotnetTestFilters)
local dotnetDisabledTestsArray=($dotnetDisabledTests)
local dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
fi
if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then
local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}")
dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" )
fi
if (( ${#dotnetTestFiltersArray[@]} > 0 )); then
local OLDIFS="$IFS" IFS='&'
dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}")
IFS="$OLDIFS"
fi
local libraryPath="${LD_LIBRARY_PATH-}"
if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
local OLDIFS="$IFS" IFS=':'
libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath"
IFS="$OLDIFS"
fi
if [[ -n ${enableParallelBuilding-} ]]; then
local -r maxCpuFlag="$NIX_BUILD_CORES"
else
local -r maxCpuFlag="1"
fi
local projectFile runtimeId
for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do
for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
local runtimeIdFlagsArray=()
if [[ $projectFile == *.csproj ]]; then
runtimeIdFlagsArray=("--runtime" "$runtimeId")
fi
LD_LIBRARY_PATH=$libraryPath \
dotnet test "$projectFile" \
-maxcpucount:"$maxCpuFlag" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
--configuration "$dotnetBuildType" \
--no-restore \
--no-build \
--logger "console;verbosity=normal" \
"${runtimeIdFlagsArray[@]}" \
"${dotnetTestFlagsArray[@]}" \
"${dotnetFlagsArray[@]}"
done
done
runHook postCheck
echo "Finished dotnetCheckHook"
}
if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then
checkPhase=dotnetCheckHook
fi
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
-78
View File
@@ -1,78 +0,0 @@
dotnetConfigureHook() {
echo "Executing dotnetConfigureHook"
runHook preConfigure
local -r dynamicLinker=@dynamicLinker@
local -r libPath=@libPath@
if [[ -n $__structuredAttrs ]]; then
local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
local dotnetFlagsArray=( "${dotnetFlags[@]}" )
local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" )
local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
else
local dotnetProjectFilesArray=($dotnetProjectFiles)
local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
local dotnetFlagsArray=($dotnetFlags)
local dotnetRestoreFlagsArray=($dotnetRestoreFlags)
local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
fi
if [[ -z ${enableParallelBuilding-} ]]; then
local -r parallelFlag="--disable-parallel"
fi
if [[ -v dotnetSelfContainedBuild ]]; then
if [[ -n $dotnetSelfContainedBuild ]]; then
dotnetRestoreFlagsArray+=("-p:SelfContained=true")
else
dotnetRestoreFlagsArray+=("-p:SelfContained=false")
fi
fi
dotnetRestore() {
local -r projectFile="${1-}"
for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
dotnet restore ${1+"$projectFile"} \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:NuGetAudit=false \
--runtime "$runtimeId" \
${parallelFlag-} \
"${dotnetRestoreFlagsArray[@]}" \
"${dotnetFlagsArray[@]}"
done
}
if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then
dotnet tool restore
fi
# dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but
# avoid other project-specific logic. This is a hack, but the old behavior
# is worse as it relied on a bug: setting projectFile to an empty string
# made the hooks actually skip all project-specific logic. It’s hard to keep
# backwards compatibility with this odd behavior now since we are using
# arrays, so instead we just pass a variable to indicate that we don’t have
# projects.
if [[ -z ${dotnetGlobalTool-} ]]; then
if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
dotnetRestore
fi
local projectFile
for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do
dotnetRestore "$projectFile"
done
fi
runHook postConfigure
echo "Finished dotnetConfigureHook"
}
if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then
configurePhase=dotnetConfigureHook
fi
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh
-101
View File
@@ -1,101 +0,0 @@
# For compatibility, convert makeWrapperArgs to an array unless we are using
# structured attributes. That is, we ensure that makeWrapperArgs is always an
# array.
# See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3
# and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920
if [[ -z $__structuredAttrs ]]; then
makeWrapperArgs=( ${makeWrapperArgs-} )
fi
# First argument is the executable you want to wrap,
# the second is the destination for the wrapper.
wrapDotnetProgram() {
local -r dotnetRuntime=@dotnetRuntime@
local -r wrapperPath=@wrapperPath@
local -r dotnetFromEnvScript='dotnetFromEnv() {
local dotnetPath
if command -v dotnet 2>&1 >/dev/null; then
dotnetPath=$(which dotnet) && \
dotnetPath=$(realpath "$dotnetPath") && \
dotnetPath=$(dirname "$dotnetPath") && \
export DOTNET_ROOT="$dotnetPath"
fi
}
dotnetFromEnv'
if [[ -n $__structuredAttrs ]]; then
local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
else
local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
fi
local dotnetRuntimeDepsFlags=()
if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then
local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}")
local OLDIFS="$IFS" IFS=':'
dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}")
IFS="$OLDIFS"
fi
local dotnetRootFlagsArray=()
if [[ -z ${dotnetSelfContainedBuild-} ]]; then
if [[ -n ${useDotnetFromEnv-} ]]; then
# if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath")
dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript")
if [[ -n $dotnetRuntime ]]; then
dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin")
fi
elif [[ -n $dotnetRuntime ]]; then
dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet")
dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin")
fi
fi
makeWrapper "$1" "$2" \
"${dotnetRuntimeDepsFlags[@]}" \
"${dotnetRootFlagsArray[@]}" \
"${gappsWrapperArgs[@]}" \
"${makeWrapperArgs[@]}"
echo "installed wrapper to "$2""
}
dotnetFixupHook() {
local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
local executable executableBasename
# check if dotnetExecutables is declared (including empty values, in which case we generate no executables)
if declare -p dotnetExecutables &>/dev/null; then
if [[ -n $__structuredAttrs ]]; then
local dotnetExecutablesArray=( "${dotnetExecutables[@]}" )
else
local dotnetExecutablesArray=($dotnetExecutables)
fi
for executable in "${dotnetExecutablesArray[@]}"; do
executableBasename=$(basename "$executable")
local path="$dotnetInstallPath/$executable"
if test -x "$path"; then
wrapDotnetProgram "$path" "$out/bin/$executableBasename"
else
echo "Specified binary \"$executable\" is either not an executable or does not exist!"
echo "Looked in $path"
exit 1
fi
done
else
while IFS= read -d '' executable; do
executableBasename=$(basename "$executable")
wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \;
done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0)
fi
}
if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then
appendToVar preFixupPhases dotnetFixupHook
fi
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh
-114
View File
@@ -1,114 +0,0 @@
dotnetInstallHook() {
echo "Executing dotnetInstallHook"
runHook preInstall
local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}"
local -r dotnetBuildType="${dotnetBuildType-Release}"
if [[ -n $__structuredAttrs ]]; then
local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
local dotnetFlagsArray=( "${dotnetFlags[@]}" )
local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" )
local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" )
local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
else
local dotnetProjectFilesArray=($dotnetProjectFiles)
local dotnetFlagsArray=($dotnetFlags)
local dotnetInstallFlagsArray=($dotnetInstallFlags)
local dotnetPackFlagsArray=($dotnetPackFlags)
local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
fi
if [[ -v dotnetSelfContainedBuild ]]; then
if [[ -n $dotnetSelfContainedBuild ]]; then
dotnetInstallFlagsArray+=("--self-contained")
else
dotnetInstallFlagsArray+=("--no-self-contained")
# https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained
# Trimming is only available for self-contained build, so force disable it here
dotnetInstallFlagsArray+=("-p:PublishTrimmed=false")
fi
fi
if [[ -n ${dotnetUseAppHost-} ]]; then
dotnetInstallFlagsArray+=("-p:UseAppHost=true")
fi
if [[ -n ${enableParallelBuilding-} ]]; then
local -r maxCpuFlag="$NIX_BUILD_CORES"
else
local -r maxCpuFlag="1"
fi
dotnetPublish() {
local -r projectFile="${1-}"
for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
runtimeIdFlagsArray=()
if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then
runtimeIdFlagsArray+=("--runtime" "$runtimeId")
fi
dotnet publish ${1+"$projectFile"} \
-maxcpucount:"$maxCpuFlag" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:OverwriteReadOnlyFiles=true \
--output "$dotnetInstallPath" \
--configuration "$dotnetBuildType" \
--no-restore \
--no-build \
"${runtimeIdFlagsArray[@]}" \
"${dotnetInstallFlagsArray[@]}" \
"${dotnetFlagsArray[@]}"
done
}
dotnetPack() {
local -r projectFile="${1-}"
for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do
dotnet pack ${1+"$projectFile"} \
-maxcpucount:"$maxCpuFlag" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-p:OverwriteReadOnlyFiles=true \
--output "$out/share/nuget/source" \
--configuration "$dotnetBuildType" \
--no-restore \
--no-build \
--runtime "$runtimeId" \
"${dotnetPackFlagsArray[@]}" \
"${dotnetFlagsArray[@]}"
done
}
if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
dotnetPublish
else
local projectFile
for projectFile in "${dotnetProjectFilesArray[@]}"; do
dotnetPublish "$projectFile"
done
fi
if [[ -n ${packNupkg-} ]]; then
if (( ${#dotnetProjectFilesArray[@]} == 0 )); then
dotnetPack
else
local projectFile
for projectFile in "${dotnetProjectFilesArray[@]}"; do
dotnetPack "$projectFile"
done
fi
fi
runHook postInstall
echo "Finished dotnetInstallHook"
}
if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then
installPhase=dotnetInstallHook
fi
pkgs/by-name/ar/arc-theme/package.nix
+2 -2
View File
@@ -10,7 +10,7 @@
gnome-themes-extra,
gtk-engine-murrine,
inkscape,
cinnamon-common,
cinnamon,
makeFontsConf,
python3,
}:
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
# "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
# "-Dvariants=light,darker,dark,lighter"
"-Dcinnamon_version=${cinnamon-common.version}"
"-Dcinnamon_version=${cinnamon.version}"
"-Dgnome_shell_version=${gnome-shell.version}"
# You will need to patch gdm to make use of this.
"-Dgnome_shell_gresource=true"
pkgs/by-name/ar/artichoke/package.nix
+4 -4
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage {
pname = "artichoke";
version = "0-unstable-2025-07-28";
version = "0-unstable-2025-08-03";
src = fetchFromGitHub {
owner = "artichoke";
repo = "artichoke";
rev = "148d3bf4bc361fa3214c02219e50e22e4cf2a3cf";
hash = "sha256-CKCRFSg8ROMhKwiIDU9iAYY/HfGtYlW1zrtn7thxIzY=";
rev = "ff0b17820a5f64ea9e8b744cef4a9111df3ed252";
hash = "sha256-0SUU/1gp7A0gjluc8ZyF9C4ZxAgNsM6jwuT3E8GxFQY=";
};
cargoHash = "sha256-a43awTdhOlu+KO3B6XQ7Vdv4NbZ3iffq4rpmBBgUcZ8=";
cargoHash = "sha256-JD+qt0pu5wxIuLa3Bd9eadQFE7dyKzqxsAKPebG7+Zg=";
nativeBuildInputs = [
rustPlatform.bindgenHook
pkgs/by-name/cf/cf-hero/package.nix
+34
View File
@@ -0,0 +1,34 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule (finalAttrs: {
pname = "cf-hero";
version = "1.0.4";
src = fetchFromGitHub {
owner = "musana";
repo = "CF-Hero";
tag = "v${finalAttrs.version}";
hash = "sha256-n0kcapHBz6Dap6KKJByCwBZmXmcO/aK88X78Yit6rx4=";
};
vendorHash = "sha256-Yf+iZ3UIpP9EtOWW1jh3h3zTFK1D7mcOh113Q4fbAhA=";
ldflags = [
"-s"
"-w"
];
meta = {
description = "Tool that uses multiple data sources to discover the origin IP addresses of Cloudflare-protected web applications";
homepage = "https://github.com/musana/CF-Hero";
changelog = "https://github.com/musana/CF-Hero/releases/tag/${finalAttrs.src.tag}";
# No licensing details present, https://github.com/musana/CF-Hero/issues/16
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "cf-hero";
};
})
pkgs/by-name/ch/chroma/package.nix
+2 -2
View File
@@ -10,7 +10,7 @@ in
buildGoModule rec {
pname = "chroma";
version = "2.19.0";
version = "2.20.0";
# To update:
# nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@@ -21,7 +21,7 @@ buildGoModule rec {
inherit (srcInfo) sha256;
};
vendorHash = "sha256-Gqldcp68Rn4wkfQptbmKUjkwLSb+qaFboJNfmWVkrPU=";
vendorHash = "sha256-GiaVgqhhrexSnBWVtQ+/cwdykHVDxR95BFMkrH1s+8Q=";
modRoot = "./cmd/chroma";
pkgs/by-name/ch/chroma/src.json
+6 -5
View File
@@ -1,12 +1,13 @@
{
"url": "https://github.com/alecthomas/chroma.git",
"rev": "adeac8f5dbfb6806a51bcf07eefd89fc8a0aee6a",
"date": "2025-07-01T09:59:45+10:00",
"path": "/nix/store/063ldbczafhxq02g5n28bxr1xnl6fwgd-chroma",
"sha256": "1r50gqbizi7l1l07syx9wgfyx1k8gzspmsbpk42jnwgw3h9dcw42",
"hash": "sha256-gnDWEhz8cSsFmXfpevV/aIbu3eOpe30ADfTEHxd+oOQ=",
"rev": "303b65df3f2d2151cee24bcf9f9b625db474ef51",
"date": "2025-08-04T13:55:06+10:00",
"path": "/nix/store/1f8p33h1srs9knj6sn6mc5rf0wcybf4g-chroma",
"sha256": "05w4hnfcxqdlsz7mkc0m3jbp1aj67wzyhq5jh8ldfgnyjnlafia3",
"hash": "sha256-Q0WnqJXePtcogrJg6D8/RqpwlxwVsFnP17ThzpyFhBc=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"fetchTags": false,
"leaveDotGit": false
}
pkgs/by-name/ci/cinnamon-desktop/package.nix
+1 -1
View File
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file
patchShebangs install-scripts/meson_install_schemas.py
sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon
sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon/share/cinnamon
'';
meta = with lib; {
pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix
+2 -2
View File
@@ -15,7 +15,7 @@
cinnamon-desktop,
cinnamon-session,
cinnamon-settings-daemon,
cinnamon-common,
cinnamon,
bulky,
}:
@@ -35,7 +35,7 @@ let
cinnamon-desktop
cinnamon-session
cinnamon-settings-daemon
cinnamon-common
cinnamon
gnome-terminal
gsettings-desktop-schemas
gtk3
pkgs/by-name/ci/cinnamon-screensaver/package.nix
+4 -4
View File
@@ -9,7 +9,7 @@
dbus,
gettext,
cinnamon-desktop,
cinnamon-common,
cinnamon,
intltool,
libxslt,
gtk3,
@@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-screensaver";
version = "6.4.0";
version = "6.4.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-screensaver";
rev = version;
hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA=";
hash = "sha256-CK4WP5IafNII81e8HxUNN3Vp36Ln78Xvv5lIMvL+nbk=";
};
patches = [
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
pam
cairo
cinnamon-desktop
cinnamon-common
cinnamon
libgnomekbd
caribou
];
pkgs/by-name/ci/cinnamon-common/libdir.patch → pkgs/by-name/ci/cinnamon/libdir.patch
View File
pkgs/by-name/ci/cinnamon-common/package.nix → pkgs/by-name/ci/cinnamon/package.nix
+3 -4
View File
@@ -73,16 +73,15 @@ let
]
);
in
# TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "6.4.7";
pname = "cinnamon";
version = "6.4.10";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-WBdzlourYf2oEXUMbzNcNNsc8lBo6ujAy/K1Y6nGOjU=";
hash = "sha256-8yg39x5rWxJ2IcDFO4AjqrctPSjqdUSfmrKbjT3Yx+0=";
};
patches = [
pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch → pkgs/by-name/ci/cinnamon/use-sane-install-dir.patch
View File
pkgs/by-name/cj/cjs/package.nix
+4 -4
View File
@@ -8,7 +8,7 @@
glib,
readline,
libsysprof-capture,
spidermonkey_115,
spidermonkey_128,
meson,
mesonEmulatorHook,
dbus,
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "cjs";
version = "6.4.0";
version = "128.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cjs";
rev = version;
hash = "sha256-2lkIWroOo3hxu9/L/Ty7CADzVrZ0ohyHVmm65NoNlD4=";
hash = "sha256-B9N/oNRvsnr3MLkpcH/aBST6xOJSFdvSUFuD6EldE38=";
};
outputs = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
cairo
readline
libsysprof-capture
spidermonkey_115
spidermonkey_128
];
propagatedBuildInputs = [
pkgs/by-name/co/codex/package.nix
+4 -3
View File
@@ -14,18 +14,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.11.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-t7FgR84alnJGhN/dsFtUySFfOpGoBlRfP+D/Q6JPz5M=";
hash = "sha256-qpYkD8fpnlTJ7RLAQrfswLFc58l/KY0x8NgGl/msG/I=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-SNl6UXzvtVR+ep7CIoCcpvET8Hs7ew1fmHqOXbzN7kU=";
cargoHash = "sha256-oPWkxEMnffDZ7cmjWmmYGurYnHn4vYu64BhG7NhrxhE=";
nativeBuildInputs = [
installShellFiles
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=includes_base_instructions_override_in_request" # Fails with 'stream ended unexpectedly: InternalAgentDied'
"--skip=includes_user_instructions_message_in_request" # Fails with 'stream ended unexpectedly: InternalAgentDied'
"--skip=originator_config_override_is_used" # Fails with 'stream ended unexpectedly: InternalAgentDied'
"--skip=azure_overrides_assign_properties_used_for_responses_url" # Panics
"--skip=test_conversation_create_and_send_message_ok" # Version 0.0.0 hardcoded
"--skip=test_send_message_session_not_found" # Version 0.0.0 hardcoded
"--skip=test_send_message_success" # Version 0.0.0 hardcoded
pkgs/by-name/de/deepsource/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "deepsource";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "DeepSourceCorp";
repo = "cli";
rev = "v${version}";
hash = "sha256-GWIQT6VIvU4ZIHwK3v2bGasE4mJc2cMpUAJvIQ2zJR4=";
hash = "sha256-kmP3U6SRvolmi7QA0rFNTg+w+DJEQUHOmbSE4sdEBK4=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/dn/dnscontrol/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "dnscontrol";
version = "4.22.0";
version = "4.23.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = "dnscontrol";
tag = "v${version}";
hash = "sha256-5K2o0qa+19ur6axDrVkhDDoTMzRO/oNYIGJciIKGvII=";
hash = "sha256-Jaa+geO2836kQHTRhaQru367iQvqac6sgnpL9244dkw=";
};
vendorHash = "sha256-hniL/pFbYOjpLuAHdH0gD0kFKnW9d/pN7283m9V3e/0=";
vendorHash = "sha256-PbOqi9vfz46lwoP3aUPl/JKDJtYYF7IwnN9lppZ8KYA=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/do/dotenv-cli/package.nix
+3 -3
View File
@@ -10,18 +10,18 @@
}:
stdenv.mkDerivation rec {
pname = "dotenv-cli";
version = "9.0.0";
version = "10.0.0";
src = fetchFromGitHub {
owner = "entropitor";
repo = "dotenv-cli";
rev = "v${version}";
hash = "sha256-mpVObsilwVCq1V2Z11uqK1T7VgwpfTYng2vqrTqJZE4=";
hash = "sha256-prSGIEHf6wRqOFVsn3Ws25yG7Ga2YEbiU/IMP3QeLXU=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-ak6QD9Z0tE0XgFVt3QkjZxk2kelUFPX9bEF855RiY2w=";
hash = "sha256-rbG1oM1mEZSB/eYp87YMi6v9ves5YR7u7rkQRlziz7I=";
};
nativeBuildInputs = [
pkgs/by-name/ld/ld-audit-search-mod/package.nix
+44
View File
@@ -0,0 +1,44 @@
{
cmake,
fetchFromGitHub,
lib,
stdenv,
storeDir ? builtins.storeDir,
spdlog,
yaml-cpp,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ld-audit-search-mod";
version = "0-unstable-2025-06-19";
src = fetchFromGitHub {
repo = "ld-audit-search-mod";
owner = "DDoSolitary";
rev = "261f475f154d0f1f0766d6756af9c714eeeb14ea";
hash = "sha256-c6ub+m4ihIE3gh6yHtLfJIVqm12C46wThrBCqp8SOLE=";
sparseCheckout = [ "src" ];
};
sourceRoot = "${finalAttrs.src.name}/src";
buildInputs = [
spdlog
yaml-cpp
];
nativeBuildInputs = [ cmake ];
cmakeFlags = [
(lib.cmakeFeature "NIX_RTLD_NAME" (builtins.baseNameOf stdenv.cc.bintools.dynamicLinker))
(lib.cmakeFeature "NIX_STORE_DIR" storeDir)
];
meta = {
inherit (finalAttrs.src.meta) homepage;
description = "Audit module that modifies ld.so library search behavior";
license = lib.licenses.mit;
maintainers = [
lib.maintainers.atry
lib.maintainers.DDoSolitary
];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/li/limine/package.nix
+2 -2
View File
@@ -42,14 +42,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: {
pname = "limine";
version = "9.5.1";
version = "9.5.4";
# We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
hash = "sha256-UgY8S+XGlSnO1k98JWBfSN0/IY3LANVFgJwI1kdPAcU=";
hash = "sha256-X0dStbsBJyFDUG25G4PUZInp+yVG3+p3bfhwQL280ig=";
};
enableParallelBuilding = true;
pkgs/by-name/mo/moonlight/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "moonlight";
version = "1.3.25";
version = "1.3.26";
src = fetchFromGitHub {
owner = "moonlight-mod";
repo = "moonlight";
tag = "v${finalAttrs.version}";
hash = "sha256-raqn8TVqD/VFgPw6kiv69JoBmUUVp9Ltj9n2EeEg85U=";
hash = "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4=";
};
nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ nodejs_22 ];
fetcherVersion = 2;
hash = "sha256-KZOAbU6IBytkZzwB8jbSwmlkM69uhjNUEKmIu5/DySI=";
hash = "sha256-LUUpcC2eS8VvzguicIn9xsKql9w3533xxUJ+l7e7Anc=";
};
env = {
pkgs/by-name/ok/okteto/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "okteto";
version = "3.9.0";
version = "3.10.0";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
tag = finalAttrs.version;
hash = "sha256-gGtQrhetIWV7ZvnmPYcGzz718uGyAdRiraiKODrJS4w=";
hash = "sha256-ZMvZP7p/Ew3TvPLV5U1v0TG0FCWU8VTAcSMtOJLrWVQ=";
};
vendorHash = "sha256-P+N8PYh6+qj1sEp1s9yswA3HOVlI87+XOj6j9hijSuw=";
vendorHash = "sha256-Pun9LgQAv/wlX0CwU4AJuEkMeZgPTL+ExmUevURvjYE=";
postPatch = ''
# Disable some tests that need file system & network access.
pkgs/by-name/op/opa-envoy-plugin/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@ assert
buildGoModule rec {
pname = "opa-envoy-plugin";
version = "1.6.0-envoy-2";
version = "1.7.1-envoy";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa-envoy-plugin";
tag = "v${version}";
hash = "sha256-pYyGbZKrdQj1Bw6q4c8wcfqOzgX/WE0hn/qODxFItB0=";
hash = "sha256-q4Cs5/QtGTWj8Ljr1R7BD6GWge6+/hUDAF/M2N/tgWE=";
};
vendorHash = null;
pkgs/by-name/pi/pinta/package.nix
+1
View File
@@ -57,6 +57,7 @@ buildDotnetModule rec {
# Build translations
dotnet build Pinta \
--no-restore \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
-target:CompileTranslations,PublishTranslations \
pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ callPackage, commandLineArgs }:
callPackage ./generic.nix { inherit commandLineArgs; } {
pname = "signal-desktop-bin";
version = "7.59.0";
version = "7.64.0";
libdir = "usr/lib64/signal-desktop";
bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
bsdtar -xf $downloadedFile -C "$out"
'';
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09213968-signal-desktop/signal-desktop-7.59.0-1.fc42.aarch64.rpm";
hash = "sha256-nGpSWlTJ1M6UL7V3o57KByfh55LL/p3I9h+XmoJhuec=";
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09358233-signal-desktop/signal-desktop-7.64.0-1.fc42.aarch64.rpm";
hash = "sha256-VWDw1eSYze23obCU/R4chesJvZZo1JbDGvR82Jg99og=";
}
pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "signal-desktop-bin";
version = "7.59.0";
version = "7.64.0";
src = fetchurl {
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
hash = "sha256-maBZqSklxa1Vg3U6xbQxYx+McPTWa4WdBCKh4tq6W4g=";
hash = "sha256-Ir0p2M3P8bUNi16i4aGO8RmUD20mYKbVD+4twHEOMJc=";
};
sourceRoot = ".";
pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ callPackage, commandLineArgs }:
callPackage ./generic.nix { inherit commandLineArgs; } rec {
pname = "signal-desktop-bin";
version = "7.59.0";
version = "7.64.0";
libdir = "opt/Signal";
bindir = libdir;
extractPkg = "dpkg-deb -x $downloadedFile $out";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-SgTbV7KrGVdN87hgfjxamKikBxVHPIiaXAV2K3kljsU=";
hash = "sha256-3mibhZJpY/yo4RzZ6LQbI5xUlGgK6zGtB48Q8yDgflc=";
}
pkgs/by-name/to/tombi/package.nix
+3 -3
View File
@@ -7,19 +7,19 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tombi";
version = "0.4.37";
version = "0.4.42";
src = fetchFromGitHub {
owner = "tombi-toml";
repo = "tombi";
tag = "v${finalAttrs.version}";
hash = "sha256-K2JIP9dqeAbfc4NefN8zdvzvRqGnH7qTLUzD11vDnd0=";
hash = "sha256-EOUi8yIXRJag9U2RzXWgX8vmOO7OJ/hmCpx7BvKsml4=";
};
# Tests relies on the presence of network
doCheck = false;
cargoBuildFlags = [ "--package tombi-cli" ];
cargoHash = "sha256-Vkj0BXvY9hGS2pq8mz0ZKhZBQLakh+hIIZ8Py5cgtl8=";
cargoHash = "sha256-Hwa+P0Qt3W171EzhuEdzY85w3XuHv6s4MCFkH4Ejqa8=";
postPatch = ''
substituteInPlace Cargo.toml \
pkgs/by-name/tr/trayscale/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "trayscale";
version = "0.18.1";
version = "0.18.3";
src = fetchFromGitHub {
owner = "DeedleFake";
repo = "trayscale";
tag = "v${version}";
hash = "sha256-zbqn0BBL/r03lpZsHszooFkLolS4FdXM8JC6mSlNlVg=";
hash = "sha256-rk4JfK0wBvWLis9XvaZuwAoMyLfoySt3SHLJChYl0SE=";
};
vendorHash = "sha256-FifYgTWDfUFQShon4PyiiA0UgSQPmwwRaLdEKJrOZcc=";
vendorHash = "sha256-8Um5Ps1EEVShJEeCRkGE3pJi2/5PxgEVNqq3JsKdivA=";
subPackages = [ "cmd/trayscale" ];
pkgs/by-name/xe/xenia-canary/package.nix
+3 -3
View File
@@ -19,14 +19,14 @@
}:
llvmPackages_20.stdenv.mkDerivation {
pname = "xenia-canary";
version = "0-unstable-2025-07-27";
version = "0-unstable-2025-08-06";
src = fetchFromGitHub {
owner = "xenia-canary";
repo = "xenia-canary";
fetchSubmodules = true;
rev = "4e8e789876329e03697d1542718fbc21b5053aa5";
hash = "sha256-sfNkMeOEvmBbFv2mDnKs3UGPxFRvts9wcgcA23endUI=";
rev = "e9b24642541f0203d369fedd74900cbbaddeac1e";
hash = "sha256-q3NJvt19mi6Ve5rMHAtzP3P/ryiypCAuiEsVVCDKn8M=";
};
dontConfigure = true;
pkgs/by-name/ze/zed-editor/package.nix
+3 -3
View File
@@ -99,7 +99,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zed-editor";
version = "0.197.6";
version = "0.198.2";
outputs = [
"out"
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
hash = "sha256-+QynG2YvAxl3v6Rb89+wv4wSSrBKYKeYfmoQ6pGLa4w=";
hash = "sha256-0BX8LFoW4VpTN2jSJqp/Y+urpLy8Llxyvfr5O4brCSA=";
};
patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
'';
cargoHash = "sha256-O5HUOVtaxUdanh83JjauUskMnEv+y7BWY6S7T4WbgyE=";
cargoHash = "sha256-H8ns6LrHHgND41KyhpXjdtLToIEHBu0I3vNRLAjtPTY=";
nativeBuildInputs = [
cmake
pkgs/development/compilers/dotnet/vmr.nix
+2 -2
View File
@@ -230,6 +230,8 @@ stdenv.mkDerivation rec {
substituteInPlace \
src/runtime/src/coreclr/ilasm/CMakeLists.txt \
--replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
''
+ lib.optionalString (lib.versionOlder version "10") ''
# https://github.com/dotnet/source-build/issues/4444
xmlstarlet ed \
@@ -237,8 +239,6 @@ stdenv.mkDerivation rec {
-s '//Project/Target/MSBuild[@Targets="Restore"]' \
-t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
src/aspnetcore/eng/Tools.props
''
+ lib.optionalString (lib.versionOlder version "10") ''
# patch packages installed from npm cache
xmlstarlet ed \
--inplace \
pkgs/development/compilers/dotnet/wrapper.nix
+13
View File
@@ -18,6 +18,8 @@
replaceVars,
nugetPackageHook,
xmlstarlet,
pkgs,
recurseIntoAttrs,
}:
type: unwrapped:
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -280,6 +282,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
};
}
// lib.optionalAttrs (type == "sdk") ({
buildDotnetModule = recurseIntoAttrs (
(pkgs.appendOverlays [
(self: super: {
dotnet-sdk = finalAttrs.finalPackage;
dotnet-runtime = finalAttrs.finalPackage.runtime;
})
]).callPackage
../../../test/dotnet/default.nix
{ }
);
console = lib.recurseIntoAttrs {
# yes, older SDKs omit the comma
cs = mkConsoleTests "C#" "cs" "Hello,?\\ World!";
pkgs/development/python-modules/asf-search/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "asf-search";
version = "9.0.7";
version = "9.0.9";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "asfadmin";
repo = "Discovery-asf_search";
tag = "v${version}";
hash = "sha256-qfP02OQ3RQx8EZsrbrSvlFkz16MZsTT7phemrKo8vEI=";
hash = "sha256-1ZJsVcbqvB0DpcVyCWaEdYEnDXDDIupiprcIZlRCWDo=";
};
pythonRelaxDeps = [ "tenacity" ];
pkgs/development/python-modules/hko/default.nix
+34
View File
@@ -0,0 +1,34 @@
{
lib,
buildPythonPackage,
fetchPypi,
poetry-core,
aiohttp,
}:
buildPythonPackage rec {
pname = "hko";
version = "0.3.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-6FzdaSaw7sX52wM8HbHFGtKdR2JBg3B2cMZnP7RfQzs=";
};
build-system = [ poetry-core ];
dependencies = [ aiohttp ];
# Tests require network access
doCheck = false;
pythonImportsCheck = [ "hko" ];
meta = {
description = "Unofficial Python wrapper for the Hong Kong Observatory public API";
homepage = "https://github.com/MisterCommand/python-hko";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.jamiemagee ];
};
}
pkgs/development/python-modules/ipycanvas/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "ipycanvas";
version = "0.13.3";
version = "0.14.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ToZ8UJsB9cTPwAn32SHjLloSoCmshW54wE/xW2VpLEo=";
hash = "sha256-kh8UgiWLWSm1mTF7XBKZMdgOFr41+jgwCjLnqkz+n4k=";
};
# We relax dependencies here instead of pulling in a patch because upstream
pkgs/development/python-modules/pysoma/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pysoma";
version = "0.0.13";
version = "0.0.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-1bS9zafuqxwcuqpM/AA3ZjNbFpxBNXtoHYFsQOWmLXQ=";
hash = "sha256-DlyOQmhseCIeaYlzTmkQBSlDjJlPZn7FRExil5gQjdY=";
};
# Project has no test
pkgs/development/python-modules/readabilipy/default.nix
+15 -3
View File
@@ -44,9 +44,9 @@ buildPythonPackage rec {
dontNpmBuild = true;
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
beautifulsoup4
html5lib
lxml
@@ -75,6 +75,18 @@ buildPythonPackage rec {
"tests/test_benchmarking.py"
];
disabledTests = [
# IndexError: list index out of range
"test_html_blacklist"
"test_prune_div_with_one_empty_span"
"test_prune_div_with_one_whitespace_paragraph"
"test_empty_page"
"test_contentless_page"
"test_extract_title"
"test_iframe_containing_tags"
"test_iframe_with_source"
];
passthru = {
tests.version = testers.testVersion {
package = readabilipy;
@@ -85,10 +97,10 @@ buildPythonPackage rec {
meta = with lib; {
description = "HTML content extractor";
mainProgram = "readabilipy";
homepage = "https://github.com/alan-turing-institute/ReadabiliPy";
changelog = "https://github.com/alan-turing-institute/ReadabiliPy/blob/${src.tag}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "readabilipy";
};
}
pkgs/development/python-modules/sabctools/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
pname = "sabctools";
version = "8.2.5";
version = "8.2.6";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-ZEC813/JpGPEFL+nXKFAXFfUrrhECCIqONe27LwS00g=";
hash = "sha256-olZSIjfP2E1tkCG8WzEZfrBJuDEp3PZyFFE5LJODEZE=";
};
nativeBuildInputs = [ setuptools ];
pkgs/development/python-modules/triggercmd/default.nix
+40
View File
@@ -0,0 +1,40 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
requests,
websocket-client,
pyjwt,
}:
buildPythonPackage rec {
pname = "triggercmd";
version = "0.0.27";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-4MTRtDo4kD/1Bifw8wx++TZ3K2M4TMVRyvwqGL5cHC8=";
};
build-system = [ setuptools ];
dependencies = [
requests
websocket-client
pyjwt
];
# Tests require network access and authentication tokens
doCheck = false;
pythonImportsCheck = [ "triggercmd" ];
meta = {
description = "Python agent for TRIGGERcmd cloud service";
homepage = "https://github.com/rvmey/triggercmd-python-agent";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.jamiemagee ];
};
}
pkgs/os-specific/linux/ch9344/default.nix
+1
View File
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
patches = [
./fix-linux-6-12-build.patch
./fix-linux-6-15-build.patch
./fix-linux-6-16-build.patch
];
sourceRoot = "${src.name}/driver";
pkgs/os-specific/linux/ch9344/fix-linux-6-16-build.patch
+16
View File
@@ -0,0 +1,16 @@
diff --git a/ch9344.c b/ch9344.c
index 36402c0..9f0df54 100644
--- a/ch9344.c
+++ b/ch9344.c
@@ -929,7 +929,11 @@ static void timer_function(unsigned long arg)
static void timer_function(struct timer_list *t)
{
unsigned char *buffer;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0))
+ struct ch9344_ttyport *ttyport = timer_container_of(ttyport, t, timer);
+#else
struct ch9344_ttyport *ttyport = from_timer(ttyport, t, timer);
+#endif
int fifolen = kfifo_len(&ttyport->rfifo);
int len;
pkgs/servers/apache-kafka/default.nix
+4 -4
View File
@@ -22,9 +22,9 @@ let
nixosTest = nixosTests.kafka.base.kafka_4_0;
};
"3_9" = {
kafkaVersion = "3.9.0";
kafkaVersion = "3.9.1";
scalaVersion = "2.13";
sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE=";
sha256 = "sha256-3UOZgW5niUbKt2470WhhA1VeabyPKrhobNpxqhW8MaM=";
jre = jdk17_headless;
nixosTest = nixosTests.kafka.base.kafka_3_9;
};
@@ -36,9 +36,9 @@ let
nixosTest = nixosTests.kafka.base.kafka_3_8;
};
"3_7" = {
kafkaVersion = "3.7.1";
kafkaVersion = "3.7.2";
scalaVersion = "2.13";
sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k=";
sha256 = "sha256-eZgLcO2D8R4so3qU1k6+QS1ImeI+YKAsJdQILzooLW8=";
jre = jdk17_headless;
nixosTest = nixosTests.kafka.base.kafka_3_7;
};
pkgs/servers/home-assistant/component-packages.nix
+6 -2
View File
@@ -2292,7 +2292,8 @@
];
"hko" =
ps: with ps; [
]; # missing inputs: hko
hko
];
"hlk_sw16" =
ps: with ps; [
hlk-sw16
@@ -6159,7 +6160,8 @@
];
"triggercmd" =
ps: with ps; [
]; # missing inputs: triggercmd
triggercmd
];
"tts" =
ps: with ps; [
ha-ffmpeg
@@ -7142,6 +7144,7 @@
"history"
"history_stats"
"hive"
"hko"
"hlk_sw16"
"holiday"
"home_connect"
@@ -7681,6 +7684,7 @@
"transmission"
"transport_nsw"
"trend"
"triggercmd"
"tts"
"tuya"
"twentemilieu"
pkgs/test/dotnet/use-dotnet-from-env/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ let
'';
});
runtimeVersion = lib.getVersion dotnet-runtime;
runtimeVersion = lib.head (lib.splitString "-" (lib.getVersion dotnet-runtime));
runtimeVersionFile = builtins.toFile "dotnet-version.txt" runtimeVersion;
in
{
pkgs/top-level/aliases.nix
+1 -1
View File
@@ -446,7 +446,7 @@ mapAliases {
CHOWTapeModel = chow-tape-model; # Added 2024-06-12
chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18
chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
cinnamon = throw "The cinnamon scope has been removed and all packages have been moved to the top-level"; # Added 2024-11-25
cinnamon-common = cinnamon; # Added 2025-08-06
citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
pkgs/top-level/python-packages.nix
+4
View File
@@ -6584,6 +6584,8 @@ self: super: with self; {
hkavr = callPackage ../development/python-modules/hkavr { };
hko = callPackage ../development/python-modules/hko { };
hledger-utils = callPackage ../development/python-modules/hledger-utils { };
hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { };
@@ -18348,6 +18350,8 @@ self: super: with self; {
trie = callPackage ../development/python-modules/trie { };
triggercmd = callPackage ../development/python-modules/triggercmd { };
trimesh = callPackage ../development/python-modules/trimesh { };
trino-python-client = callPackage ../development/python-modules/trino-python-client { };