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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-07-28 18:29:44 +00:00
committed by GitHub
parent 1b67e7e42c d607f5fd5b
commit f9ae478ae2
118 changed files with 1765 additions and 2239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+11
View File
@@ -12466,6 +12466,12 @@
github = "james-atkins";
githubId = 9221409;
};
jamesbrink = {
email = "dev.urandom.io@gmail.com";
name = "James Brink";
github = "jamesbrink";
githubId = 646361;
};
jamespeapen = {
name = "James Eapen";
email = "james.eapen@vai.org";
@@ -14771,6 +14777,11 @@
githubId = 12160;
name = "Kirill Radzikhovskyy";
};
kiryuulight = {
github = "KiryuuLight";
githubId = 70501251;
name = "Luis Ortiz";
};
kiskae = {
github = "Kiskae";
githubId = 546681;
nixos/doc/manual/release-notes/rl-2305.section.md
+1 -1
View File
@@ -139,7 +139,7 @@ In addition to numerous new and updated packages, this release has the following
- [readarr](https://github.com/Readarr/Readarr), book manager and automation (Sonarr for ebooks). Available as [services.readarr](options.html#opt-services.readarr.enable).
- [ReGreet](https://github.com/rharish101/ReGreet), a clean and customizable greeter for greetd. Available as [programs.regreet](#opt-programs.regreet.enable).
- [ReGreet](https://github.com/rharish101/ReGreet), a clean and customizable greeter for greetd. Available as `programs.regreet.enable`.
- [rshim](https://github.com/Mellanox/rshim-user-space), the user-space rshim driver for the BlueField SoC. Available as [services.rshim](options.html#opt-services.rshim.enable).
nixos/doc/manual/release-notes/rl-2611.section.md
+9
View File
@@ -70,6 +70,11 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Artalk has been updated to 2.10.0. Its default configuration and data
directory discovery changed; see the [upstream migration
guide](https://artalk.js.org/en/guide/releases/v2.10.0.html) when invoking
`artalk` directly. The `services.artalk` module is unaffected.
- `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly.
- `authentik` has been updated to 2026.5.3, which changes the default listen address from `0.0.0.0` to `[::]`.
@@ -127,10 +132,14 @@
- Package `overseerr` has been removed as the `overseerr` and `jellyseerr` projects were merged under `seerr`.
- `slskd` has been updated to v0.25.0, which renames the `global` option to `transfers`. Please review the [changelog](https://github.com/slskd/slskd/releases#release-0.25.0).
## Other Notable Changes {#sec-release-26.11-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- `programs.regreet` has been renamed to `services.displayManager.regreet`.
- `komodo` has been updated to the v2 release line (2.x). See the [upstream v1 → v2 upgrade guide](https://github.com/moghtech/komodo/releases/tag/v2.0.0).
- `temporal` has been updated to the 1.31 release line. Always consult the [upstream upgrade
nixos/modules/module-list.nix
+1 -1
View File
@@ -308,7 +308,6 @@
./programs/qgroundcontrol.nix
./programs/qt5ct.nix
./programs/quark-goldleaf.nix
./programs/regreet.nix
./programs/rog-control-center.nix
./programs/rush.nix
./programs/rust-motd.nix
@@ -636,6 +635,7 @@
./services/display-managers/lemurs.nix
./services/display-managers/ly.nix
./services/display-managers/plasma-login-manager.nix
./services/display-managers/regreet.nix
./services/display-managers/sddm.nix
./services/editors/emacs.nix
./services/editors/haste.nix
nixos/modules/programs/regreet.nix → nixos/modules/services/display-managers/regreet.nix
+7 -3
View File
@@ -5,12 +5,16 @@
...
}:
let
cfg = config.programs.regreet;
cfg = config.services.displayManager.regreet;
settingsFormat = pkgs.formats.toml { };
user = config.services.greetd.settings.default_session.user;
in
{
options.programs.regreet = {
imports = [
(lib.mkRenamedOptionModule [ "programs" "regreet" ] [ "services" "displayManager" "regreet" ])
];
options.services.displayManager.regreet = {
enable = lib.mkEnableOption null // {
description = ''
Enable ReGreet, a clean and customizable greeter for greetd.
@@ -144,7 +148,7 @@ in
fonts.packages = [ cfg.font.package ];
programs.regreet.settings.GTK = {
services.displayManager.regreet.settings.GTK = {
cursor_theme_name = cfg.cursorTheme.name;
font_name = "${cfg.font.name} ${toString cfg.font.size}";
icon_theme_name = cfg.iconTheme.name;
nixos/modules/services/networking/bind.nix
+1 -1
View File
@@ -89,7 +89,7 @@ let
${lib.optionalString cfg.checkConfig ''
echo "Checking named configuration file...";
mkdir -p ${testFakeDir}
${lib.getExe' bindPkg "named-checkconf"} -z $target
${lib.getExe' bindPkg "named-checkconf"} -z $target || { exit=$?; cat -n $target; exit $exit; }
''}
substituteInPlace $target \
nixos/modules/services/web-apps/dawarich.nix
+4 -1
View File
@@ -281,7 +281,7 @@ in
If `sidekiqProcesses` is configured and any processes specify null `threads`, this value is used.
'';
type = lib.types.int;
default = 5;
default = 3;
};
sidekiqProcesses = lib.mkOption {
@@ -304,10 +304,13 @@ in
"digests"
"exports"
"families"
"highest_priority"
"imports"
"low_priority"
"mailers"
"places"
"points"
"posters"
"reverse_geocoding"
"stats"
"tracks"
nixos/modules/services/web-apps/slskd.nix
+9 -7
View File
@@ -78,6 +78,9 @@ in
'';
default = { };
type = submodule {
imports = [
(lib.mkRenamedOptionModule [ "global" ] [ "transfers" ])
];
freeformType = settingsFormat.type;
options = {
remote_file_management = mkEnableOption "modification of share contents through the web ui";
@@ -145,8 +148,7 @@ in
};
};
global = {
# TODO speed units
transfers = {
upload = {
slots = mkOption {
type = ints.unsigned;
@@ -154,7 +156,7 @@ in
};
speed_limit = mkOption {
type = ints.unsigned;
description = "Total upload speed limit.";
description = "Total upload speed limit in kibibytes per second.";
};
};
download = {
@@ -164,7 +166,7 @@ in
};
speed_limit = mkOption {
type = ints.unsigned;
description = "Total upload download limit";
description = "Total download speed limit in kibibytes per second.";
};
};
};
@@ -265,9 +267,9 @@ in
cfg = config.services.slskd;
confWithoutNullValues = (
lib.filterAttrsRecursive (
key: value: (builtins.tryEval value).success && value != null
) cfg.settings
lib.filterAttrsRecursive (key: value: (builtins.tryEval value).success && value != null) (
lib.removeAttrs cfg.settings [ "global" ]
)
);
configurationYaml = settingsFormat.generate "slskd.yml" confWithoutNullValues;
pkgs/applications/emulators/libretro/cores/fbneo.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2026-07-19";
version = "0-unstable-2026-07-28";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "63796c5d2d40010b5a495c748b74f5f8cd7d8b4d";
hash = "sha256-Mv7NSw28O41iPEfaE5d7tAZPgUA7XmRFUODfatgTEiI=";
rev = "c79a2611849c6b2e76b638659f6f28b3244bd627";
hash = "sha256-5EfZIM+tXBCsCI/tktW9yS2V6zlmWSxnlGv0JP51fbI=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/meteor.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "meteor";
version = "0-unstable-2026-04-20";
version = "0-unstable-2026-07-22";
src = fetchFromGitHub {
owner = "libretro";
repo = "meteor-libretro";
rev = "77658235b09979850bb9f89298cfc6c6504f0e14";
hash = "sha256-l/m8HmKnOt/zJ8V+IBqKYc2UZaRBQiaqkpzUPZnKOd0=";
rev = "94226aded4afbcd3bd1bad69277db7a2fae64a4a";
hash = "sha256-OpAq3Yjzm3qtj+P71Kx36980PTx01lloNEq0CXbJeIc=";
};
makefile = "Makefile";
pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
+3 -3
View File
@@ -7,13 +7,13 @@
mkHyprlandPlugin {
pluginName = "hypr-dynamic-cursors";
version = "0-unstable-2026-06-03";
version = "0-unstable-2026-07-21";
src = fetchFromGitHub {
owner = "VirtCode";
repo = "hypr-dynamic-cursors";
rev = "da447486c84e0be81f2cdd208af1ef92469f0a88";
hash = "sha256-G3VOjqBgsnwaYQicqC4zjaUVCdsnzZ5sMPoUOPPnfXQ=";
rev = "f5ba36c7622098b53bf62ddb8ddf03b914abbdf8";
hash = "sha256-HKzJtEkafkWjTx35spDp6pm1oClN7vIipJ2wwU4ocNY=";
};
dontUseCmakeConfigure = true;
pkgs/by-name/ae/aerc/package.nix
+3 -3
View File
@@ -17,17 +17,17 @@
buildGoModule (finalAttrs: {
pname = "aerc";
version = "0.21.0";
version = "0.22.0";
src = fetchFromSourcehut {
owner = "~rjarry";
repo = "aerc";
rev = finalAttrs.version;
hash = "sha256-UBXMAIuB0F7gG0dkpEF/3V4QK6FEbQw2ZLGGmRF884I=";
hash = "sha256-JeIhZvUPrvWdeTae558jbn0reQuDAxNl29ziGcB+7ts=";
};
proxyVendor = true;
vendorHash = "sha256-E/DnfiHoDDNNoaNGZC/nvs8DiJ8F2+H2FzxpU7nK+bE=";
vendorHash = "sha256-iGVRh4AFR1y6mtv7I89ar26PxGxfnEGdtaiTzI7cSnw=";
nativeBuildInputs = [
scdoc
pkgs/by-name/ar/arcdps-log-manager/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
}:
buildDotnetModule (finalAttrs: {
pname = "arcdps-log-manager";
version = "1.16";
version = "1.16.1";
src = fetchFromGitHub {
owner = "gw2scratch";
repo = "evtc";
tag = "manager-v${finalAttrs.version}";
hash = "sha256-AiIWYb3hwkE20NdmAHlSt55QJ/d3NnQt3ZeX1COUG7k=";
hash = "sha256-mBckZvGJZozZrLPtQCBqHpEj0ukPxY1QmffntbgnEP8=";
};
nugetDeps = ./deps.json;
pkgs/by-name/ar/archon-lite/package.nix
+8 -11
View File
@@ -4,26 +4,23 @@
fetchurl,
nix-update-script,
}:
let
appimageTools.wrapType2 (finalAttrs: {
pname = "archon-lite";
version = "9.4.36";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/download/v${version}/archon-lite-v${version}.AppImage";
url = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/download/v${finalAttrs.version}/archon-lite-v${finalAttrs.version}.AppImage";
hash = "sha256-th48nSDIi2iugtiqjgkI7/QZtBq+BRQjRs1pKweDArI=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
mkdir -p $out/share/applications
mkdir -p $out/share/icons/hicolor/512x512/apps
cp -r ${extracted}/usr/share/icons/hicolor/512x512/apps/'Archon App Lite.png' $out/share/icons/hicolor/512x512/apps/archon-lite.png
cp -r ${finalAttrs.contents}/usr/share/icons/hicolor/512x512/apps/'Archon App Lite.png' $out/share/icons/hicolor/512x512/apps/archon-lite.png
chmod -R +w $out/share/
test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294
cp ${extracted}/'Archon App Lite.desktop' $out/share/applications/archon-lite.desktop
cp ${finalAttrs.contents}/'Archon App Lite.desktop' $out/share/applications/archon-lite.desktop
substituteInPlace $out/share/applications/archon-lite.desktop \
--replace-fail "Exec=AppRun --no-sandbox" "Exec=archon-lite" \
--replace-fail "Icon=Archon App Lite" "Icon=archon-lite"
@@ -34,7 +31,7 @@ appimageTools.wrapType2 {
meta = {
description = "Application for uploading MMORPG combat logs";
homepage = "https://www.archon.gg/download";
downloadPage = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/tag/v${version}";
downloadPage = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/tag/v${finalAttrs.version}";
license = lib.licenses.unfree; # no license listed
mainProgram = "archon-lite";
platforms = lib.platforms.linux;
@@ -44,4 +41,4 @@ appimageTools.wrapType2 {
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
})
pkgs/by-name/ar/artalk/frontend.nix
+58
View File
@@ -0,0 +1,58 @@
{
lib,
stdenvNoCC,
nodejs,
pnpmConfigHook,
pnpm_10,
fetchPnpmDeps,
artalk,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "${artalk.pname}-frontend";
inherit (artalk) src version;
nativeBuildInputs = [
nodejs
pnpmConfigHook
pnpm_10
];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 4;
hash = "sha256-rs3isWKlV+RGA3shYZZpNImn9xJ67vpXoJmQoO6y2cE=";
};
# vite-plugin-checker spawns a chokidar watcher during the build, which on
# Darwin exhausts the file descriptor limit with native fs.watch.
env.CHOKIDAR_USEPOLLING = lib.optionalString stdenvNoCC.hostPlatform.isDarwin "true";
buildPhase = ''
runHook preBuild
pnpm build:all
pnpm build:plugin-kit
pnpm build:auth
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{dist/{i18n,plugins},sidebar}
# dist
cp ./ui/artalk/dist/{Artalk,ArtalkLite}.{css,js} $out/dist
cp ./ui/artalk/dist/i18n/*.js $out/dist/i18n
cp ./ui/plugin-*/dist/*.js $out/dist/plugins
# sidebar
cp -r ./ui/artalk-sidebar/dist/* $out/sidebar
runHook postInstall
'';
})
pkgs/by-name/ar/artalk/package.nix
+26 -65
View File
@@ -1,88 +1,43 @@
{
lib,
buildGoModule,
callPackage,
fetchFromGitHub,
nodejs,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
installShellFiles,
versionCheckHook,
stdenv,
nixosTests,
versionCheckHook,
nix-update-script,
}:
let
buildGoModule (finalAttrs: {
pname = "artalk";
version = "2.9.1";
version = "2.10.0";
src = fetchFromGitHub {
owner = "ArtalkJS";
repo = "artalk";
tag = "v${version}";
hash = "sha256-gzagE3muNpX/dwF45p11JAN9ElsGXNFQ3fCvF1QhvdU=";
tag = "v${finalAttrs.version}";
hash = "sha256-gtWnXRDGFjpw9W1ze6fBn/WXMQStqeyQpQHTr3wu5AU=";
};
frontend = stdenv.mkDerivation (finalAttrs: {
pname = "${pname}-frontend";
inherit src version;
nativeBuildInputs = [
nodejs
pnpmConfigHook
pnpm_10
];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 4;
hash = "sha256-RSz/bx8/BAqLZH3/yQ6/H/nnwGvcCg8EzIEJ4/xkQgQ=";
};
buildPhase = ''
runHook preBuild
pnpm build:all
pnpm build:auth
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{dist/{i18n,plugins},sidebar}
# dist
cp ./ui/artalk/dist/{Artalk,ArtalkLite}.{css,js} $out/dist
cp ./ui/artalk/dist/i18n/*.js $out/dist/i18n
cp ./ui/plugin-*/dist/*.js $out/dist/plugins
# sidebar
cp -r ./ui/artalk-sidebar/dist/* $out/sidebar
runHook postInstall
'';
});
in
buildGoModule {
inherit src pname version;
vendorHash = "sha256-oAqYQzOUjly97H5L5PQ9I2SO2KqiUVxdJA+eoPrHD6Q=";
vendorHash = "sha256-xSIkJKlWGbdBlez7jPaoeHuYbyO+2237sZ/yxjUcHf8=";
ldflags = [
"-s"
"-w"
];
preBuild = ''
cp -r ${frontend}/* ./public
preConfigure = ''
cp -r ${finalAttrs.passthru.frontend}/* ./public
'';
env.CGO_ENABLED = 0;
nativeBuildInputs = [ installShellFiles ];
# TestAuthSSOExchange
__darwinAllowLocalNetworking = true;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd artalk \
--bash <($out/bin/artalk completion bash) \
@@ -92,18 +47,24 @@ buildGoModule {
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "-v";
versionCheckProgramArg = "version";
versionCheckKeepEnvironment = [ "XDG_DATA_HOME" ];
preVersionCheck = "XDG_DATA_HOME=$TMPDIR";
passthru.tests = {
inherit (nixosTests) artalk;
passthru = {
tests = {
inherit (nixosTests) artalk;
};
frontend = callPackage ./frontend.nix { artalk = finalAttrs.finalPackage; };
updateScript = nix-update-script { extraArgs = [ "--subpackage=frontend" ]; };
};
meta = {
description = "Self-hosted comment system";
homepage = "https://github.com/ArtalkJS/Artalk";
changelog = "https://github.com/ArtalkJS/Artalk/releases/tag/v${version}";
changelog = "https://github.com/ArtalkJS/Artalk/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ moraxyc ];
mainProgram = "artalk";
};
}
})
pkgs/by-name/as/aseprite/package.nix
+14 -12
View File
@@ -32,29 +32,29 @@
zlib,
}:
let
asepriteStrings = fetchFromGitHub {
owner = "aseprite";
repo = "strings";
rev = "0f49265d7e7aea4b862b7d1e670ed969e8a469b8";
hash = "sha256-S3YkWA5ECvyyqGvojDhIZci04CTjbJzTQiJ5FZsB4lU=";
};
in
clangStdenv.mkDerivation (finalAttrs: {
pname = "aseprite";
version = "1.3.17.2";
version = "1.3.18.1";
src = fetchFromGitHub {
owner = "aseprite";
repo = "aseprite";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-+rLrk/c3WLqNhXQ7J0eeqZ3h4PsbZad61Cxw0RubWgk=";
hash = "sha256-uItjmYg21Ph2QIYFKm0N6kVwJtedH0aVKm8hSbQcJIM=";
};
# Translation files are copied without overwriting existing ones to preserve the potentially more up-to-date English file from the main source.
asepriteStrings = fetchFromGitHub {
owner = "aseprite";
repo = "strings";
rev = "417074f649f359f98511fc87a707c276d87f5739";
hash = "sha256-5bB7yK4eJHhkUwGYtIFYdFXpRrBt69VBbTh7EmPFI08=";
};
# Translation files are copied without overwriting existing ones to preserve
# the potentially more up-to-date English file from the main source.
postUnpack = ''
cp --no-clobber ${asepriteStrings}/* "$sourceRoot/data/strings"
cp --no-clobber ${finalAttrs.asepriteStrings}/* "$sourceRoot/data/strings"
'';
nativeBuildInputs = [
@@ -175,6 +175,8 @@ clangStdenv.mkDerivation (finalAttrs: {
rmdir "$out/bin" 2>/dev/null || true
'';
passthru.updateScript = ./update.sh;
meta = {
homepage = "https://www.aseprite.org/";
description = "Animated sprite editor & pixel art tool";
pkgs/by-name/as/aseprite/update.sh
Executable
+29
View File
@@ -0,0 +1,29 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl jq nix nix-update
set -euo pipefail
curl_github() {
curl -fsSL -H 'Accept: application/vnd.github+json' ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} "$@"
}
nix-update aseprite
version=$(nix eval --raw --file . aseprite.version)
release_date=$(
curl_github "https://api.github.com/repos/aseprite/aseprite/releases/tags/v$version" \
| jq --exit-status --raw-output '.published_at'
)
strings_rev=$(
curl_github "https://api.github.com/repos/aseprite/strings/commits?until=$release_date&per_page=1" \
| jq --exit-status --raw-output '.[0].sha'
)
current_strings_rev=$(nix eval --raw --file . aseprite.asepriteStrings.rev)
if [[ $strings_rev != "$current_strings_rev" ]]; then
update-source-version aseprite \
--source-key=asepriteStrings \
--rev="$strings_rev" \
--ignore-same-version
fi
pkgs/by-name/au/audiobookshelf/package.nix
+4 -4
View File
@@ -15,10 +15,10 @@
let
source = {
version = "2.35.1";
hash = "sha256-31cKSjSTJyUetjCSOCDY2wnTFV+Z52LcvGrh7Emc0cM=";
npmDepsHash = "sha256-wmbzbMQHrbHcL9JSpPXpc+vjjj5LTNN8e6Ug3ZRQ7mo=";
clientNpmDepsHash = "sha256-wJdCvUVLZzCY3iW/Q7QVuRu96s49TehnuQNqbImbe0g=";
version = "2.36.0";
hash = "sha256-oohjRiKARpIyoPFEXR24nlKK4xBBEHUMVTaq/i6NfV8=";
npmDepsHash = "sha256-uDIL9PxbFUa3MwLoPomTfq1A/R1ewDIv+EFWml/8uy8=";
clientNpmDepsHash = "sha256-0xqqpls8FLuXngjjdwjoNLpq9dSixWouROviTjsFCbU=";
};
src = fetchFromGitHub {
pkgs/by-name/bc/bcc/package.nix
+2 -9
View File
@@ -5,7 +5,6 @@
cmake,
elfutils,
fetchFromGitHub,
fetchpatch,
flex,
iperf,
lib,
@@ -23,14 +22,14 @@
python3Packages.buildPythonApplication rec {
pname = "bcc";
version = "0.36.1";
version = "0.37.0";
pyproject = false;
src = fetchFromGitHub {
owner = "iovisor";
repo = "bcc";
tag = "v${version}";
hash = "sha256-+XBFENCAKP8Z+5dviBervDXHOM2qY3lfDFsDKVjzMbM=";
hash = "sha256-OfQWqZ7yyN+rs6PJP5QUIn07QdxOiBoUEetGQPp6KJo=";
};
patches = [
@@ -44,12 +43,6 @@ python3Packages.buildPythonApplication rec {
(replaceVars ./absolute-ausyscall.patch {
ausyscall = lib.getExe' audit "ausyscall";
})
(fetchpatch {
# https://github.com/iovisor/bcc/issues/5501
url = "https://github.com/iovisor/bcc/commit/c3f35ecca18b1ce926bd272f60f6d4465656a80b.patch";
hash = "sha256-Fr5SqDUpQzZj8yPST0V1QExNMCSoRbOXG5ZaChDXTZQ=";
})
];
build-system = [ python3Packages.setuptools ];
pkgs/by-name/bi/bioawk/package.nix
+1 -1
View File
@@ -9,7 +9,7 @@
stdenv.mkDerivation {
pname = "bioawk";
version = "unstable-2017-09-11";
version = "1.0-unstable-2017-09-11";
src = fetchFromGitHub {
owner = "lh3";
pkgs/by-name/bu/buildah/package.nix
+3 -2
View File
@@ -73,6 +73,7 @@ runCommand buildah-unwrapped.name
mkdir -p $out
ln -s ${buildah-unwrapped}/share $out/share
makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \
--set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \
--prefix PATH : "${binPath}"
--set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin ${
lib.optionalString (binPath != "") "--prefix PATH : \"${binPath}\""
}
''
pkgs/by-name/ch/chatzone-desktop/package.nix
+3 -3
View File
@@ -10,10 +10,10 @@
let
pname = "chatzone-desktop";
version = "5.6.2";
version = "5.7.0";
src = fetchurl {
url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.6.2/1175/chatzone-desktop-linux-5.6.2.AppImage";
hash = "sha256-2t3mp0snHn2NxVFCcU1XQ5h3rUCb4gXjKbF43p9W8ZU=";
url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.7.0/1258/chatzone-desktop-linux-5.7.0.AppImage";
hash = "sha256-t8qAdrvs1M9NuaQYZj+pCaYiSb4TZc7rY1rJVjSYaAE=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
in
pkgs/by-name/ch/checkstyle/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
}:
maven.buildMavenPackage (finalAttrs: {
version = "13.8.0";
version = "13.9.0";
pname = "checkstyle";
src = fetchFromGitHub {
owner = "checkstyle";
repo = "checkstyle";
tag = "checkstyle-${finalAttrs.version}";
hash = "sha256-Nhn65Y6iz55wucAQ/DiF9VWm15O7m7+ZhOM+X4rIHGQ=";
hash = "sha256-1ddajDPf32fauHA3zFTMa6s/cJqrhTI1z4E2GOWRxn4=";
};
mvnHash = "sha256-GhnxhSZX+plwQq9l4av6dqLEVp7HwT5aTVHKoTfaP8c=";
mvnHash = "sha256-T5zXmanif0ttB1srKzYeoXAQQqhRfAUW2V7v7N/I79k=";
nativeBuildInputs = [
maven
pkgs/by-name/ci/cider-2/package.nix
+12 -5
View File
@@ -35,10 +35,15 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib
gtk3
libgbm
libGL
nspr
nss
];
# appendRunpaths is applied to every ELF, including shared libraries.
# runtimeDependencies wouldn't work here because autoPatchelfHook rewrites
# the RPATH of dynamic executables only, not of shared libraries.
appendRunpaths = lib.makeLibraryPath [
libGL # libEGL.so.1 is dlopen'd by ANGLE from libGLESv2.so
];
unpackPhase = ''
runHook preUnpack
@@ -55,12 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
chmod +x $out/lib/cider/Cider
# The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3.
# The prefixes that follow --add-flags are typically injected via wrapGAppsHook3.
# We append them manually instead to avoid a double-wrapping.
makeWrapper $out/lib/cider/Cider $out/bin/cider-2 \
--add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
--add-flags "--no-sandbox --disable-gpu-sandbox" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
--prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules" \
@@ -72,12 +76,15 @@ stdenv.mkDerivation (finalAttrs: {
postFixup = ''
mv $out/share/applications/cider.desktop $out/share/applications/cider-2.desktop
substituteInPlace $out/share/applications/cider-2.desktop \
--replace-fail Exec=cider Exec=cider-2
--replace-fail Exec=cider Exec=cider-2 \
--replace-fail Icon=cider Icon=cider-2
install -Dm444 $out/share/pixmaps/cider.png \
$out/share/icons/hicolor/256x256/apps/cider.png
$out/share/icons/hicolor/256x256/apps/cider-2.png
rm -r $out/share/{pixmaps,lintian}
rm $out/lib/cider/resources/Cider{,.flatpak}.desktop
rm $out/lib/cider/resources/public/icon{.icns,-osx-previous.icns,.ico}
'';
passthru.updateScript = ./updater.sh;
pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
}:
buildGoModule (finalAttrs: {
pname = "cloudflare-dynamic-dns";
version = "4.5.1";
version = "4.5.2";
src = fetchFromGitHub {
owner = "zebradil";
repo = "cloudflare-dynamic-dns";
tag = finalAttrs.version;
hash = "sha256-EMT4vFm1EJxHFfnjh4ExfWOqaA+s9bJbI71wj//oRv0=";
hash = "sha256-jMFkiYQFFS4pvivN3x4AmPALdJ5YK235Bh6mCs4AhBs=";
};
vendorHash = "sha256-1x1Hw343ylhGsbNcj4hwweYnACoVZSdycwBbGUVuu+k=";
vendorHash = "sha256-fYgtHDJhJIrhS1zDbPkHXISFLiEnMLn/uu9LMVBgJog=";
subPackages = ".";
pkgs/by-name/da/dawarich/gemset.nix
Generated
+94 -105
View File
@@ -350,10 +350,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ihq7k01fwayf4ir0n6g99r7s8xja1rnr55p9agfdqffhlzwaq8s";
sha256 = "1xycpapjai97hb5y4h1ilj1my1k2wz22z7cmy9rncqcg7vfv3sbp";
type = "gem";
};
version = "1.1259.0";
version = "1.1262.0";
};
aws-sdk-core = {
dependencies = [
@@ -398,10 +398,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04k5wasssinx66vws2jn4vhzfisg30mkhbdmcs3m99dhp66kmcnl";
sha256 = "1gz2b34pm4myc0hksqhxi9n1z2k57x6z3q0yqs99pv06w0qz96g5";
type = "gem";
};
version = "1.225.1";
version = "1.226.0";
};
aws-sigv4 = {
dependencies = [ "aws-eventstream" ];
@@ -484,10 +484,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0vyg9l6xivamb49r4kzkcw12r9x943kv79wsvwslhm1qjvx23ybv";
sha256 = "1gnj45h8zk4fbk034syhpmk45a0mdl5bzb3asqr4pzfkj2b5ywq3";
type = "gem";
};
version = "8.0.4";
version = "8.0.5";
};
builder = {
groups = [
@@ -639,15 +639,16 @@
groups = [
"default"
"development"
"staging"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw";
sha256 = "15djj19ynz3sbw54fsf8n7y3sha8a333f2mgvjfwhr46jhcqg1ll";
type = "gem";
};
version = "1.0.6";
version = "1.0.7";
};
cronex = {
dependencies = [
@@ -1145,10 +1146,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04gzhqvsm4z4l12r9dkac9a75ah45w186ydhl0i4andldsnkkih5";
sha256 = "09zl0rkskfq0cwfrk9ypjvflvzanfg3xbhh1slaa1myry7xi4zq3";
type = "gem";
};
version = "1.3.0";
version = "1.4.0";
};
google-id-token = {
dependencies = [ "jwt" ];
@@ -1252,10 +1253,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1994i044vdmzzkyr76g8rpl1fq1532wf0sb21xg5r1ilj5iphmr8";
sha256 = "1dfikmmd9dllirsfq0kjiyxpmlq0afkxm5sslsr97r9g85ifpy80";
type = "gem";
};
version = "1.14.8";
version = "1.15.2";
};
icons = {
dependencies = [ "nokogiri" ];
@@ -1263,10 +1264,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1s7lg09ki7x02advdrn98fa2gxbwaq5adlnf8mxqcnmsa4gid27x";
sha256 = "1p69yh21qc7s6ydgl0f7z30zwqq137wkx4d19vg7c6sa871nb0qj";
type = "gem";
};
version = "0.8.1";
version = "0.9.0";
};
importmap-rails = {
dependencies = [
@@ -1365,10 +1366,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1anz6a6n33x4s3906s0bz6x161kk1ns3h7xxsn3rpxkfsw7k2m33";
sha256 = "0ay31y1yl208xrpcsw6b0k4q309magq7q5prmdbb0lm9ampbqqlk";
type = "gem";
};
version = "2.19.8";
version = "2.20.0";
};
json-jwt = {
dependencies = [
@@ -1538,10 +1539,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "011fdngxzr1p9dq2hxqz7qq1glj2g44xnhaadjqlf48cplywfdnl";
sha256 = "062r891hxis58j5q735kk9sj5srxx0rv813f8m95bilsjm3gf1r0";
type = "gem";
};
version = "2.25.1";
version = "2.25.2";
};
mail = {
dependencies = [
@@ -2003,10 +2004,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06iv4rh9hfqx9q2yxl6yr5nqqlc6xp60sqmnf94f2zw3k5csynj5";
sha256 = "0hnv1yfq1gl267vvir4086crs87j78d7w1i091fa5szgwd7p94av";
type = "gem";
};
version = "3.11.0";
version = "3.14.4";
};
posthog-ruby = {
dependencies = [ "concurrent-ruby" ];
@@ -2014,10 +2015,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0v3yciwz314asqvxkc3qli5z7vn86c11dx2hjy0dcx2x4nb2gd6h";
sha256 = "1v90nk41f54hgdxbz8hzn9ppqn3ffrq0g37zfhqmn91znjr4jknh";
type = "gem";
};
version = "3.11.0";
version = "3.14.3";
};
pp = {
dependencies = [ "prettyprint" ];
@@ -2043,10 +2044,10 @@
];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1xlxmg86k5kifci1xvlmgw56x88dmqf04zfzn7zcr4qb8ladal99";
sha256 = "0w5mha75hs8gdj75g8vl0sxpyp8rzvwq8a4jcmi4ah8cf370zjyz";
type = "gem";
};
version = "0.6.3";
version = "0.6.4";
};
prettyprint = {
groups = [
@@ -2153,38 +2154,6 @@
};
version = "0.3.11";
};
psych = {
dependencies = [
"date"
"stringio"
];
groups = [
"default"
"development"
"staging"
"test"
];
platforms = [
{
engine = "maglev";
}
{
engine = "mingw";
}
{
engine = "mingw";
}
{
engine = "ruby";
}
];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql";
type = "gem";
};
version = "5.4.0";
};
public_suffix = {
groups = [
"default"
@@ -2272,6 +2241,20 @@
};
version = "6.8.0";
};
rack-cors = {
dependencies = [
"logger"
"rack"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0s1zymxhk7pkzsrgrn5ax862p07s0drbv0qvnq36jq1rvdhvx5bv";
type = "gem";
};
version = "3.0.0";
};
rack-oauth2 = {
dependencies = [
"activesupport"
@@ -2412,10 +2395,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "128y5g3fyi8fds41jasrr4va1jrs7hcamzklk1523k7rxb64bc98";
sha256 = "1hi25xz5ijz3kjx4vsiywqbq05mlkas7di8pwc3p6mhyn34sg5z7";
type = "gem";
};
version = "1.7.0";
version = "1.7.1";
};
rails_icons = {
dependencies = [
@@ -2426,10 +2409,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0yqdd1qrvggh5gb3qicngxxassbqi1nyviiyqr6j9pg6853gn3y4";
sha256 = "1ld4k5l8qnmxm1725p12qqzrbfwnhl5n2fy1arkxfy5912cs0apn";
type = "gem";
};
version = "1.8.0";
version = "1.9.0";
};
railties = {
dependencies = [
@@ -2484,10 +2467,10 @@
};
version = "13.4.2";
};
rdoc = {
rbs = {
dependencies = [
"erb"
"psych"
"logger"
"prism"
"tsort"
];
groups = [
@@ -2512,10 +2495,44 @@
];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46";
sha256 = "050f0b6bv94k4vszy366m5l5krfgn93y9sj43yd9sm184q7gfyss";
type = "gem";
};
version = "7.2.0";
version = "4.0.3";
};
rdoc = {
dependencies = [
"erb"
"prism"
"rbs"
"tsort"
];
groups = [
"default"
"development"
"staging"
"test"
];
platforms = [
{
engine = "maglev";
}
{
engine = "mingw";
}
{
engine = "mingw";
}
{
engine = "ruby";
}
];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0sf4909q2mr9z0rpygv94z12b0yamg07gz8cba2mi5k3m448rgq3";
type = "gem";
};
version = "8.0.0";
};
redis = {
groups = [
@@ -2875,10 +2892,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "138qbhxb6r8qyq6kz38i3wq4k2rdcrhfcyicxzw1798na7sxvndr";
sha256 = "02wfn0s1f9058hk0i9si1gddv9wnng20m4d2r15z63idcvqxs874";
type = "gem";
};
version = "1.87.0";
version = "1.88.0";
};
rubocop-ast = {
dependencies = [
@@ -2909,10 +2926,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1xaxlfas5grja3lvzjrfiv86ah3rxa15cmi7hc79b2cw8cjs7sis";
sha256 = "1qrz1wdjx1zkwk3vjhbfnd2dlk5j9g2hg1ifqsd8xfh2c29kq2zh";
type = "gem";
};
version = "2.35.4";
version = "2.35.5";
};
ruby-next-core = {
groups = [ "default" ];
@@ -2945,10 +2962,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0khy3d43cr2i4x9as2k41ckrjb4wkpcycdbzaara4fy4qw923n9f";
sha256 = "00nafgqjhwa504xrjv32v0757a2xcvspsia8s7mp4n62nm2yfy8a";
type = "gem";
};
version = "3.3.1";
version = "3.4.1";
};
sanitize = {
dependencies = [
@@ -2990,10 +3007,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xw4bpmw2kfpfk187mnga2ranalm688y1w26kic6kwwsa9rg07bg";
sha256 = "1lg22fmcalwnzgnanswn5g7vc24wmancnvbyf1ynzb46vyj6bb7c";
type = "gem";
};
version = "4.44.0";
version = "4.45.0";
};
sentry-rails = {
dependencies = [
@@ -3030,10 +3047,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xwwfj48d6mpc66lhl4yabnjazpf47wqg9n1i9na7q0h9isdigxl";
sha256 = "1202qsi1xsskl4qa9fwlzwhs3j783445w20v24js57avfvjldfsx";
type = "gem";
};
version = "7.0.1";
version = "8.0.1";
};
sidekiq = {
dependencies = [
@@ -3184,34 +3201,6 @@
};
version = "1.3.4";
};
stringio = {
groups = [
"default"
"development"
"staging"
"test"
];
platforms = [
{
engine = "maglev";
}
{
engine = "mingw";
}
{
engine = "mingw";
}
{
engine = "ruby";
}
];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63";
type = "gem";
};
version = "3.2.0";
};
super_diff = {
dependencies = [
"attr_extras"
@@ -3502,10 +3491,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "15idgibqpdaj97f734drx8a7k1jcc8wvxlk2nbafac72ihikicjs";
sha256 = "0ij19k6034x0c4hw0ywa7wnk5s912r8aq0hhjss10d5z36q5dicp";
type = "gem";
};
version = "0.8.1";
version = "0.8.2";
};
websocket-extensions = {
groups = [ "default" ];
pkgs/by-name/da/dawarich/sources.json
+3 -3
View File
@@ -1,5 +1,5 @@
{
"version": "1.9.2",
"hash": "sha256-vUJPMwzYZK/UAFiqnn0fkJH7GJjdBkewfYikK35Tbb4=",
"npmHash": "sha256-sUDEqvqNrztedUGZRRkD2ythpBQQwpqJz/QleUvqz0Y="
"version": "1.10.1",
"hash": "sha256-YcnK1A/qAxSV4lleMT2AqAVt6QcHwI+qrzFwj38jtHs=",
"npmHash": "sha256-roVYRsYBOuDQf8vWiYIWevogArEZ1xre9sQues5E5VM="
}
pkgs/by-name/dd/ddhx/dub-lock.json
-3
View File
@@ -1,3 +0,0 @@
{
"dependencies": {}
}
pkgs/by-name/dd/ddhx/package.nix
+3 -3
View File
@@ -5,16 +5,16 @@
}:
buildDubPackage (finalAttrs: {
pname = "ddhx";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "dd86k";
repo = "ddhx";
tag = "v${finalAttrs.version}";
hash = "sha256-1dbY7xUOpwihrppuB+tyHuV2b12E4Yv2J69LXULxmg0=";
hash = "sha256-mK9vGPeHjKyElXrLmGCdon3PIYpQB2VzhgvKouk/kpA=";
};
dubLock = ./dub-lock.json;
dubLock.dependencies = { };
installPhase = ''
runHook preInstall
pkgs/by-name/de/deck/package.nix
+3 -3
View File
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "deck";
version = "1.64.0";
version = "1.65.0";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
tag = "v${finalAttrs.version}";
hash = "sha256-nVV1nNOQ5zqywUXg3vdyiudryWVRKiDWU0Yc8b0albo=";
hash = "sha256-PWaMqqRWhHcP2bSs2HuuOtlkG3rb4eTZnJNHaIxaHlw=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
];
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-lo+1ijaWod0UB2PXzmg806q2KYrVu9yNgkI/Nq2lyq4=";
vendorHash = "sha256-apwPW8R8Hghd3BnSgIrjgHLsyDu8tB0rGNLxO9WftS0=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd deck \
pkgs/by-name/do/docker-sbx/package.nix
+23 -25
View File
@@ -12,29 +12,31 @@
zlib,
zstd,
versionCheckHook,
nix-update-script,
}:
let
hashes = {
"x86_64-linux" = "sha256-dwq/f5GxOrqGzHu31Ui44HyBLVoQkyGQXnt9oK0H2Zg=";
"aarch64-linux" = "sha256-tV65eOO1Zh3cpnGC+1wz086s/7wlnEw8YUGlRcmyvOw=";
"aarch64-darwin" = "sha256-uEb+wFj0z3pDQzQ5EyBsZbDDkWrd6iT82xmj2QyKuI8=";
};
platformName = {
"x86_64-linux" = "linux-amd64";
"aarch64-linux" = "linux-arm64";
"aarch64-darwin" = "darwin";
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "docker-sbx";
version = "0.34.0";
version = "0.37.0";
src =
if stdenvNoCC.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-linux-amd64.tar.gz";
hash = "sha256-5H9LOyKi0/SBVJ0ld6OkcP1h9r9eHrAb4fsVVVdMusg=";
}
else if stdenvNoCC.hostPlatform.system == "aarch64-linux" then
fetchurl {
url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-linux-arm64.tar.gz";
hash = "sha256-dZ/ttnmaf62rA5Cs8YSmZGHVQoy9PQh3Ok/AnIjCqZ4=";
}
else if stdenvNoCC.hostPlatform.system == "aarch64-darwin" then
fetchurl {
url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-darwin.tar.gz";
hash = "sha256-aBh6NbtQ5o2zxuR+d1U1gZpm2bch/J3Y8GZ73DeUBUk=";
}
else
throw "Unsupported host platform ${stdenvNoCC.hostPlatform.system}";
let
throwPlat = throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}";
p = platformName.${stdenvNoCC.hostPlatform.system} or throwPlat;
in
fetchurl {
url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-${p}.tar.gz";
hash = hashes.${stdenvNoCC.hostPlatform.system} or throwPlat;
};
strictDeps = true;
__structuredAttrs = true;
@@ -102,7 +104,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
passthru.updateScript = ./update.sh;
meta = {
description = "Safe environments for agents";
@@ -114,11 +116,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
homepage = "https://docs.docker.com/reference/cli/sbx/";
changelog = "https://github.com/docker/sbx-releases/releases/tag/v${finalAttrs.version}";
mainProgram = "sbx";
platforms = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
];
platforms = builtins.attrNames hashes;
license = lib.licenses.unfree;
maintainers = [
lib.maintainers.skyesoss
pkgs/by-name/do/docker-sbx/update.sh
Executable
+59
View File
@@ -0,0 +1,59 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash gh gnugrep gnused
# shellcheck shell=bash
set -euo pipefail
dir="$(CDPATH="" cd "$(dirname "$0")" && pwd)"
pkg="$dir/package.nix"
if ! [ -e "$pkg" ]; then
echo "Unable to find package.nix"
exit 1
fi
old_vsn="$(grep --only-matching --perl-regexp 'version = "\K[^"]+' "$pkg")"
new_vsn="$(gh api repos/docker/sbx-releases/releases/latest --jq .tag_name | \
grep --only-matching --perl-regexp '\d+\.\d+\.\d+')"
if [ "$old_vsn" = "$new_vsn" ]; then
echo "No new version available, skipping"
exit 0
fi
echo "docker-sbx: $old_vsn -> $new_vsn"
fetch_arch () {
local vsn="$1" plat="$2" url hash
url="https://github.com/docker/sbx-releases/releases/download/v${vsn}/DockerSandboxes-${plat}.tar.gz"
hash="$(nix-prefetch-url --type sha256 "$url")";
nix-hash --to-sri --type sha256 "$hash"
}
declare -A hashes
declare -A platNames=(
["linux-amd64"]="x86_64-linux"
["linux-arm64"]="aarch64-linux"
["darwin"]="aarch64-darwin"
)
declare -a platforms=(
"linux-amd64"
"linux-arm64"
"darwin"
)
for plat in "${platforms[@]}"; do
hashes[$plat]="$(fetch_arch "$new_vsn" "$plat")"
done
declare -a sedArgs=(
-e 's:version = "'"$old_vsn"'":version = "'"$new_vsn"'":'
)
for plat in "${platforms[@]}"; do
p="${platNames[$plat]}"
sedArgs+=(
-e '0,/"'"$p"'" = / s:"'"$p"'" = .*;:"'"$p"'" = "'"${hashes[$plat]}"'";:'
)
done
sed -i "${sedArgs[@]}" "$pkg"
pkgs/by-name/dr/drawy/package.nix
+3 -3
View File
@@ -12,14 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "drawy";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = "drawy";
rev = "v${finalAttrs.version}";
hash = "sha256-Y6CAdHgcCK9lIae+CwqSGml+FAvVzLzyIAKdw85dKmQ=";
tag = "v${finalAttrs.version}";
hash = "sha256-lFI4q5/RKA49rcI2iSJuwYfShgOjM+EAfXM+5ZSG8SA=";
};
__structuredAttrs = true;
pkgs/by-name/en/enzyme/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
version = "0.0.286";
version = "0.0.289";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
hash = "sha256-MEGkV83xGArRZAwlRRTALOUpQV9W2tH7SLOcOyH7RCA=";
hash = "sha256-2ZnxMMCux9HedQfdPOp28EgEiQTaJ6+Pqw0M3J/q4rE=";
};
postPatch = ''
pkgs/by-name/fi/filius/package.nix
+7 -5
View File
@@ -10,16 +10,16 @@
maven.buildMavenPackage rec {
pname = "filius";
version = "2.12.1";
version = "2.13.0";
src = fetchFromGitLab {
owner = "filius1";
repo = "filius";
tag = "v${version}";
hash = "sha256-sIcYjbWONg8Cq+dHpoBYj07cyHV7oX06Xh1zK0CHn64=";
hash = "sha256-u4X6jrlNzgm1vWyRFSzVjoQ3dtZUK9pAHSMxUHsSV84=";
};
mvnHash = "sha256-41NirfgR9EhHLRT3V6P5KrakYKZ6dJTlXZu6rgCAK3I=";
mvnHash = "sha256-0xc/gnodgBo6gOkvz7Oe/5AQyjh2xMgyWEeEyktFqEA=";
mvnParameters = "-Plinux";
# tests want to create an X11 window which isn't often feasible
@@ -55,8 +55,10 @@ maven.buildMavenPackage rec {
postInstall = ''
install -Dm444 src/deb/application-filius-project.xml $out/share/mime/packages/application-filius-project.xml
install -Dm444 src/deb/filius32.png $out/share/icons/hicolor/80x56/mimetypes/filius.png
install -Dm444 src/deb/filius32.png $out/share/icons/hicolor/80x56/apps/filius.png
for size in {32,64,96}; do
install -Dm444 src/deb/icons/hicolor/"$size"x"$size"/apps/filius.png $out/share/icons/hicolor/"$size"x"$size"/apps/filius.png
install -Dm444 src/deb/icons/hicolor/"$size"x"$size"/apps/filius.png $out/share/icons/hicolor/"$size"x"$size"/mimetypes/filius.png
done
mkdir -p $out/share/man/man1/
cp src/deb/filius.1 $out/share/man/man1/
pkgs/by-name/fl/flyctl/package.nix
+3 -3
View File
@@ -12,7 +12,7 @@
buildGoModule rec {
pname = "flyctl";
version = "0.4.71";
version = "0.4.75";
src = fetchFromGitHub {
owner = "superfly";
@@ -22,11 +22,11 @@ buildGoModule rec {
cd "$out"
git rev-parse HEAD > COMMIT
'';
hash = "sha256-dCgfmG3h/E+ADbwY2pHxIFNBahSJCNGBsn3XohJMWRk=";
hash = "sha256-2fXjRmWQdgoh9RctWyIp5sZ5Vh4otO5+qMqJ3hUwDZY=";
};
proxyVendor = true;
vendorHash = "sha256-xm5DDXo5es7JhYXBcaohz1bkJw6yGNZl/z9W5I8lutg=";
vendorHash = "sha256-jIgd4MwTiFrJMurUf8/rV7rx2GIh5fPdsssYWi7OM7U=";
subPackages = [ "." ];
pkgs/by-name/gd/gdal/package.nix
+2 -2
View File
@@ -83,13 +83,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
version = "3.13.1";
version = "3.13.2";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
tag = "v${finalAttrs.version}";
hash = "sha256-IsSENjOJpCMnGR1O8/gV6X7GTNIK/c+JIYBrkxDgj/A=";
hash = "sha256-sHMfAAZ4LrHXXh1g3Q9WsAqt8DHRkSdBlb3kZSy+vX0=";
};
nativeBuildInputs = [
pkgs/by-name/gh/ghqr/package.nix
+3 -3
View File
@@ -10,17 +10,17 @@
buildGoModule (finalAttrs: {
pname = "ghqr";
version = "0.5.0";
version = "0.5.1";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "ghqr";
tag = "v.${finalAttrs.version}";
hash = "sha256-MpCOeKMqLyZd2N1XL7bUHuCM7AjLgsHzQ1plUKMWn50=";
hash = "sha256-cyXuBP/Uj9UdvwoV/rKWUNts44DoKnHAeOD5dzBqZBM=";
};
vendorHash = "sha256-8lyQ1LDT1GAs+UDOpLxI/6BneU6Hqyt+PWsZIkq2rHY=";
vendorHash = "sha256-R/jo2Stwt9gZkJg9WfWSBTn/+3oravtE6+yh287MjDQ=";
ldflags = [
"-s"
pkgs/by-name/go/goreleaser/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
}:
buildGo126Module (finalAttrs: {
pname = "goreleaser";
version = "2.17.0";
version = "2.17.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "goreleaser";
rev = "v${finalAttrs.version}";
hash = "sha256-BB2URWDc5WR51uVsA0I9qhd0T6wYtmqM/jF5YAaV30o=";
hash = "sha256-cySoo8JwvO92+78LXquQ+yJYkTwfEAVdA0fOj2xuWas=";
};
vendorHash = "sha256-dSJ7F7PKGMZCoKAbu7SpJSXDKQWicoqNA3Kwl9+kGwI=";
vendorHash = "sha256-gWpBkATeT3qqLozSpVySm/BUlCkPLeltBDC/JvTUetg=";
ldflags = [
"-s"
pkgs/by-name/gr/grafana/package.nix
+4 -4
View File
@@ -21,7 +21,7 @@
buildGoModule (finalAttrs: {
pname = "grafana";
version = "13.1.0";
version = "13.1.1";
subPackages = [
"pkg/cmd/grafana"
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
owner = "grafana";
repo = "grafana";
rev = "v${finalAttrs.version}";
hash = "sha256-FyrClHQwkwNW9bFbFLyuE4s9Gg0tbg7v/s1I/4XaWmM=";
hash = "sha256-e5Potkxm4VB1nUFyvByamsSkWAKMTMzpHIzrKSeRRM4=";
};
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -49,12 +49,12 @@ buildGoModule (finalAttrs: {
# Since this is not a dependency attribute the buildPackages has to be specified.
offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-TAJYJ9oMVl9cT4Vs1SZVbhKuuWp/WxM99Wt7QzLq1WQ=";
hash = "sha256-c/gCHjwfItp4h+CHa5CPKHhe8/hiqF9MNFin/hK8GmQ=";
};
disallowedRequisites = [ finalAttrs.offlineCache ];
vendorHash = "sha256-2OsgW52vQbeQu88eyoWsD8784gzI7/5SbLY62jYxukQ=";
vendorHash = "sha256-tlXBxcXt472A7PHurrbvW/SRlQmum8PUUlkmu5q2Y7Q=";
# Grafana seems to just set it to the latest version available
# nowadays.
pkgs/by-name/he/hexchat/package.nix
-90
View File
@@ -1,90 +0,0 @@
{
dbus-glib,
desktop-file-utils,
enchant_2,
fetchFromGitHub,
gtk2,
isocodes,
lib,
libcanberra-gtk2,
libnotify,
libproxy,
lua,
makeWrapper,
meson,
ninja,
openssl,
pciutils,
perl,
pkg-config,
python3Packages,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hexchat";
version = "2.16.2";
src = fetchFromGitHub {
owner = "hexchat";
repo = "hexchat";
rev = "v${finalAttrs.version}";
hash = "sha256-rgaXqXbBWlfSyz+CT0jRLyfGOR1cYYnRhEAu7AsaWus=";
};
#hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path
postPatch = ''
sed -i "s,libenchant-2.so.2,${enchant_2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c
sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build
chmod +x meson_post_install.py
for f in meson_post_install.py \
plugins/perl/generate_header.py \
plugins/python/generate_plugin.py \
po/validate-textevent-translations \
src/common/make-te.py
do
patchShebangs $f
done
'';
mesonFlags = [
"-Dwith-lua=lua"
"-Dtext-frontend=true"
];
nativeBuildInputs = [
makeWrapper
meson
ninja
pkg-config
];
buildInputs = [
dbus-glib
desktop-file-utils
gtk2
isocodes
libcanberra-gtk2
libnotify
libproxy
lua
openssl
pciutils
perl
python3Packages.cffi
python3Packages.python
python3Packages.setuptools
];
postInstall = ''
wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH"
'';
meta = {
description = "Popular and easy to use graphical IRC (chat) client";
homepage = "https://hexchat.github.io/";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ romildo ];
};
})
pkgs/by-name/hn/hns/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "hns";
version = "1.0.8";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "primaprashant";
repo = "hns";
tag = finalAttrs.version;
hash = "sha256-VO9EX8aIudijAyzTH9cXIa1magN+wkIE0lsP+DGl8hw=";
hash = "sha256-A+vURHq6yqZqR6epYaABDu2w0LBC6nMAU1KZsAZZNrM=";
};
build-system = [
pkgs/by-name/ht/httrack/package.nix
+9 -2
View File
@@ -5,20 +5,27 @@
zlib,
openssl,
libiconv,
autoreconfHook,
autoconf-archive,
}:
stdenv.mkDerivation (finalAttrs: {
version = "3.49.7";
version = "3.49.14";
pname = "httrack";
src = fetchFromGitHub {
owner = "xroche";
repo = "httrack";
tag = finalAttrs.version;
hash = "sha256-GTNXTFU5a/c1F6dBE8iHOq4PyTgUhXrjLEE6FsPeJbQ=";
hash = "sha256-NP4i77DzD+4S0C8kpKPUX3EHfy4zAQoaXsYNmdHsbrQ=";
fetchSubmodules = true;
};
nativeBuildInputs = [
autoreconfHook
autoconf-archive
];
buildInputs = [
libiconv
openssl
pkgs/by-name/in/incus-spawn/package.nix
+4 -4
View File
@@ -14,7 +14,7 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
version = "0.2.14";
version = "0.2.15";
pname = "incus-spawn";
src =
@@ -66,15 +66,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sources = {
"x86_64-linux" = fetchurl {
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-linux-amd64";
hash = "sha256-eyz54Ej1NJaTgVJuOPJTZb7zUHpHf5/yJa9RUkEjozs=";
hash = "sha256-3YEasRSG7n5MLIkKrA1m/8Uu20ZS6D2L0tcDKcbnPoI=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-linux-aarch64";
hash = "sha256-9qDDWimLb/sDtEbJrV4LbtTiWmbRI2jws0lreECbWp8=";
hash = "sha256-ZoMiinluk8VAb28xIHcYv26K95torSIK+bd8AGvE/Po=";
};
"aarch64-darwin" = fetchurl {
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-macos-aarch64";
hash = "sha256-ILGO6CGBWAeyVrkVVOnYZQOqoIYTzogfhk4NMkeY/a4=";
hash = "sha256-dnmm4GwU5pB/ME+W4stW+jUMSUOiKGsuXnQJBRgTkps=";
};
};
pkgs/by-name/ka/kazumi/git-hashes.json
+9 -9
View File
@@ -2,14 +2,14 @@
"audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=",
"audio_service_win": "sha256-OZq2waTr0WLJ6uki/VLdUBdDdui25PvXnMNFohs7gjs=",
"desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
"media_kit": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit_libs_android_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit_libs_ios_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit_libs_linux": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit_libs_macos_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit_libs_ohos": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit_libs_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit_libs_windows_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=",
"media_kit": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"media_kit_libs_android_video": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"media_kit_libs_ios_video": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"media_kit_libs_linux": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"media_kit_libs_macos_video": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"media_kit_libs_ohos": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"media_kit_libs_video": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"media_kit_libs_windows_video": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"media_kit_video": "sha256-cKV7ST1egNdXLcsNTUcK7Xh/II72bl8cR3fJuf3/AyM=",
"webview_windows": "sha256-afBTwbam9YA0xvIYMtiJe+CKi8GWit1HqDR3J72r2o0="
}
pkgs/by-name/ka/kazumi/package.nix
+23 -5
View File
@@ -5,6 +5,8 @@
fetchFromGitHub,
autoPatchelfHook,
alsa-lib,
cacert,
glib-networking,
gst_all_1,
libayatana-appindicator,
mimalloc,
@@ -18,13 +20,13 @@
}:
let
version = "2.2.0";
version = "2.2.3";
src = fetchFromGitHub {
owner = "Predidit";
repo = "Kazumi";
tag = version;
hash = "sha256-xAXhESIGk3St2TgqLtUl6je7DlS4j4vD338T5t99OAE=";
hash = "sha256-CAc7KaTSYKy3UxLei8GPhDYbJURshChZoUhmFetBEuw=";
};
in
flutter.buildFlutterApplication {
@@ -87,6 +89,8 @@ flutter.buildFlutterApplication {
buildInputs = [
alsa-lib
cacert
glib-networking
gst_all_1.gst-libav
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
@@ -97,11 +101,18 @@ flutter.buildFlutterApplication {
webkitgtk_4_1
];
# patch onReorderItem to onReorder for nixpkgs Flutter compatibility
postPatch = ''
substituteInPlace \
lib/pages/plugin_editor/plugin_view_page.dart \
# Fix compatibility issues with Flutter 3.24+ breaking API changes
substituteInPlace lib/pages/plugin_editor/plugin_view_page.dart \
--replace-fail "onReorderItem:" "onReorder:"
substituteInPlace lib/bean/dialog/material_bottom_sheet.dart \
--replace-fail 'TabBarScrollController' 'ScrollController' \
--replace-fail 'scrollController: _scrollController,' ""
# Disable Bangumi proxy by default
substituteInPlace lib/services/storage/settings_keys.dart \
--replace-fail $'_SettingBoxKey.enableBangumiProxy,\n true,' $'_SettingBoxKey.enableBangumiProxy,\n false,'
'';
postInstall = ''
@@ -110,6 +121,13 @@ flutter.buildFlutterApplication {
install -Dm 0644 assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
'';
# Ensure HTTPS certificate bundle is available to fix TLS verification
preFixup = ''
gappsWrapperArgs+=(
--set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
)
'';
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
pkgs/by-name/ka/kazumi/pubspec.lock.json
+49 -19
View File
@@ -543,6 +543,16 @@
"source": "hosted",
"version": "7.0.1"
},
"file_picker": {
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.3.10"
},
"file_selector_linux": {
"dependency": "transitive",
"description": {
@@ -1147,6 +1157,26 @@
"source": "hosted",
"version": "1.3.0"
},
"logging_appenders": {
"dependency": "transitive",
"description": {
"name": "logging_appenders",
"sha256": "7fefa09636824f312432721c0bf77967ab19003116650729bd202bdf98142d70",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0+1"
},
"macos_secure_bookmarks": {
"dependency": "direct main",
"description": {
"name": "macos_secure_bookmarks",
"sha256": "c3163875f8fd530a1654a7cf8aa426e6e208d28bf05724a1d4960e4b7d2ca1c6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.1"
},
"matcher": {
"dependency": "transitive",
"description": {
@@ -1181,8 +1211,8 @@
"dependency": "direct main",
"description": {
"path": "media_kit",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -1192,8 +1222,8 @@
"dependency": "direct overridden",
"description": {
"path": "libs/android/media_kit_libs_android_video",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -1203,8 +1233,8 @@
"dependency": "direct overridden",
"description": {
"path": "libs/ios/media_kit_libs_ios_video",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -1214,8 +1244,8 @@
"dependency": "direct overridden",
"description": {
"path": "libs/linux/media_kit_libs_linux",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -1225,8 +1255,8 @@
"dependency": "direct overridden",
"description": {
"path": "libs/macos/media_kit_libs_macos_video",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -1236,8 +1266,8 @@
"dependency": "direct overridden",
"description": {
"path": "libs/ohos/media_kit_libs_ohos",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -1247,8 +1277,8 @@
"dependency": "direct main",
"description": {
"path": "libs/universal/media_kit_libs_video",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -1258,8 +1288,8 @@
"dependency": "direct overridden",
"description": {
"path": "libs/windows/media_kit_libs_windows_video",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -1269,8 +1299,8 @@
"dependency": "direct main",
"description": {
"path": "media_kit_video",
"ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d",
"ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"resolved-ref": "b11ec8050d1f07ca117022f2da3260281676346f",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
@@ -2416,6 +2446,6 @@
},
"sdks": {
"dart": ">=3.11.0 <4.0.0",
"flutter": ">=3.44.5"
"flutter": ">=3.44.7"
}
}
pkgs/by-name/ke/keyd/package.nix
+42 -39
View File
@@ -4,49 +4,24 @@
fetchFromGitHub,
runtimeShell,
python3Packages,
nixosTests,
versionCheckHook,
nixosTests,
nix-update-script,
}:
let
stdenv.mkDerivation (finalAttrs: {
pname = "keyd";
version = "2.6.0";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "rvaiya";
repo = "keyd";
rev = "v" + version;
tag = "v${finalAttrs.version}";
hash = "sha256-l7yjGpicX1ly4UwF7gcOTaaHPRnxVUMwZkH70NDLL5M=";
};
appMap = python3Packages.buildPythonApplication (finalAttrs: {
pname = "keyd-application-mapper";
inherit version src;
pyproject = false;
postPatch = ''
substituteInPlace scripts/${finalAttrs.pname} \
--replace-fail /bin/sh ${runtimeShell}
'';
propagatedBuildInputs = with python3Packages; [
python-xlib
pygobject3.out
dbus-python.out
];
dontBuild = true;
installPhase = ''
install -Dm555 -t $out/bin scripts/${finalAttrs.pname}
'';
meta.mainProgram = "keyd-application-mapper";
});
in
stdenv.mkDerivation {
pname = "keyd";
inherit version src;
postPatch = ''
substituteInPlace Makefile \
--replace-fail /usr/local ""
@@ -57,24 +32,52 @@ stdenv.mkDerivation {
installFlags = [ "DESTDIR=${placeholder "out"}" ];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
enableParallelBuilding = true;
postInstall = ''
ln -sf ${lib.getExe appMap} $out/bin/${appMap.pname}
ln -sf ${lib.getExe finalAttrs.passthru.appMap} $out/bin/${finalAttrs.passthru.appMap.pname}
rm -rf $out/etc
'';
passthru.tests.keyd = nixosTests.keyd;
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru = {
tests.keyd = nixosTests.keyd;
updateScript = nix-update-script { };
appMap = python3Packages.buildPythonApplication (finalAttrsApp: {
pname = "keyd-application-mapper";
inherit (finalAttrs) version src;
pyproject = false;
postPatch = ''
substituteInPlace scripts/${finalAttrsApp.pname} \
--replace-fail /bin/sh ${runtimeShell}
'';
propagatedBuildInputs = with python3Packages; [
python-xlib
pygobject3.out
dbus-python.out
];
dontBuild = true;
installPhase = ''
install -Dm555 -t $out/bin scripts/${finalAttrsApp.pname}
'';
meta.mainProgram = "keyd-application-mapper";
});
};
meta = {
description = "Key remapping daemon for Linux";
homepage = "https://github.com/rvaiya/keyd";
changelog = "https://github.com/rvaiya/keyd/blob/master/docs/CHANGELOG.md";
license = lib.licenses.mit;
mainProgram = "keyd";
maintainers = with lib.maintainers; [ alfarel ];
platforms = lib.platforms.linux;
};
}
})
pkgs/by-name/ki/kin-openapi/package.nix
+2 -2
View File
@@ -5,14 +5,14 @@
}:
buildGoModule (finalAttrs: {
pname = "kin-openapi";
version = "0.142.0";
version = "0.145.0";
vendorHash = "sha256-uprdzJnaxd1UyEdZFFPvmo2Xu/QXJdheC1eqkyKY9Zc=";
src = fetchFromGitHub {
owner = "getkin";
repo = "kin-openapi";
tag = "v${finalAttrs.version}";
hash = "sha256-QNFHKleHRjta9juSPXLJ/0h/vMV/XbODQ/z4VFD5UK0=";
hash = "sha256-lM+W1qgpvtEgOUQcKxUtsXawLnam6CkXOmX/BKkOyL4=";
};
checkFlags =
pkgs/by-name/ko/kopuz/package.nix
+3 -3
View File
@@ -45,16 +45,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
__structuredAttrs = true;
pname = "kopuz";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "Kopuz-org";
repo = "kopuz";
tag = "v${finalAttrs.version}";
hash = "sha256-JvnvZdMYg4nqW+SCQixreIRC7NFqgtI0xx24rb//txo=";
hash = "sha256-q8770ay1+z2twTOKZtcMD2AmQSHsfm6wrvb8wzq6z+4=";
};
cargoHash = "sha256-gq5ZqkH2XZPpJImdFF97ro8uKtuwMbvNG49FQPL5y3w=";
cargoHash = "sha256-+snetG9lM3vYqcyzj37Y1rnNJ6Sw9miELCjRq+vB/hc=";
env = {
RUSTY_V8_ARCHIVE = librustyV8;
pkgs/by-name/la/lazyrsync/package.nix
+40
View File
@@ -0,0 +1,40 @@
{
lib,
rustPlatform,
fetchFromGitHub,
rsync,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lazyrsync";
version = "0.1.1";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "westpoint-io";
repo = "lazyrsync";
tag = "v${finalAttrs.version}";
hash = "sha256-JBELPmNSaiwxHq9iZHvvrCX/YLSBsOO3OrzXJ0mPrNw=";
};
cargoHash = "sha256-/L6N08TFqwW6yeNFiIUtmz6SxdEuxa6SHMxDoZ4Myl8=";
nativeCheckInputs = [ rsync ];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Terminal UI for rsync with profiles, dry-run preview and live progress";
homepage = "https://lazyrsync.westpoint.io";
changelog = "https://github.com/westpoint-io/lazyrsync/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
mainProgram = "lazyrsync";
maintainers = with lib.maintainers; [ kiryuulight ];
};
})
pkgs/by-name/lo/lockbook-desktop/package.nix
+3 -3
View File
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lockbook-desktop";
version = "26.7.16";
version = "26.7.23";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = finalAttrs.version;
hash = "sha256-/aZNHeE0bfW5bYOFEboWUMIl0b4FbkdOKXxMEPUqJF0=";
hash = "sha256-LG6qeFzD1ThBFKfFjy/U012p5DH5FEojQ9W4K+ZA7/o=";
};
cargoHash = "sha256-1cbsmCHNEiN0qxSa+5v5I1/WpFuVgAWuNfMERFviSmU=";
cargoHash = "sha256-syBXLJISsok1hL4vpBforanVi9F0NI90pRslrxRuuL4=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/ma/maestro/package.nix
+2 -2
View File
@@ -10,11 +10,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "maestro";
version = "2.6.1";
version = "2.7.0";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
hash = "sha256-NECCX1FPU3xqlrz13plXgMKkp/g6QyCP3JXU8f7PrTs=";
hash = "sha256-pMyra2BGF+eu9ttPiFZmBW6r5c+jK++qO8mUBBuPy7U=";
};
dontUnpack = true;
pkgs/by-name/ma/matrix-continuwuity/package.nix
+5 -25
View File
@@ -6,7 +6,7 @@
bzip2,
zstd,
stdenv,
rocksdb,
callPackage,
nix-update-script,
testers,
matrix-continuwuity,
@@ -14,28 +14,7 @@
liburing,
nixosTests,
}:
let
rocksdb' =
(rocksdb.override {
# rocksdb does not support prefixed jemalloc, which is required on darwin
enableJemalloc = !stdenv.hostPlatform.isDarwin;
jemalloc = rust-jemalloc-sys-unprefixed;
}).overrideAttrs
(
final: old: {
version = "11.1.1";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "rocksdb";
rev = "3756b2b905e13216d8b56bcc783d814e7b073aff";
hash = "sha256-rSv4fr2bf9JJwdodgeuPCuceeh7k97KVxrAOC0wyPQY=";
};
patches = [ ];
}
);
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-continuwuity";
version = "26.7.1";
@@ -64,12 +43,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
ROCKSDB_INCLUDE_DIR = "${finalAttrs.rocksdb}/include";
ROCKSDB_LIB_DIR = "${finalAttrs.rocksdb}/lib";
};
rocksdb = callPackage ./rocksdb.nix { }; # make used rocksdb version available (e.g., for backup scripts)
passthru = {
rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
updateScript = nix-update-script { };
tests = {
version = testers.testVersion {
pkgs/by-name/ma/matrix-continuwuity/rocksdb.nix
+26
View File
@@ -0,0 +1,26 @@
{
stdenv,
fetchFromGitea,
rocksdb,
rust-jemalloc-sys-unprefixed,
}:
(rocksdb.override {
# rocksdb does not support prefixed jemalloc, which is required on darwin
enableJemalloc = !stdenv.hostPlatform.isDarwin;
jemalloc = rust-jemalloc-sys-unprefixed;
}).overrideAttrs
(
final: old: {
version = "11.1.1";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "rocksdb";
rev = "3756b2b905e13216d8b56bcc783d814e7b073aff";
hash = "sha256-rSv4fr2bf9JJwdodgeuPCuceeh7k97KVxrAOC0wyPQY=";
};
patches = [ ];
}
)
pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+2 -2
View File
@@ -14,14 +14,14 @@
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.157.1";
version = "1.157.2";
pyproject = true;
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-yDfBtcBvIoWUfD8bqwGgeMvq4XHrr9ptVB6yKJWFX0c=";
hash = "sha256-TUHcNAXrV43+J7jqfstlYdrZrwL5kDCh03yxO+vL/gw=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pkgs/by-name/n8/n8n/package.nix
+2 -2
View File
@@ -33,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
owner = "n8n-io";
repo = "n8n";
tag = "n8n@${finalAttrs.version}";
hash = "sha256-xll2dZon+WyJUXaCoel0htwgOGUqzpZvef/tDLTomZQ=";
hash = "sha256-lmkCT1o5LSC1ORd+Jozr9hkJu2znMpFO97jTWYOnga0=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 4;
hash = "sha256-uitkmRccuj+exZF0hM8tsVozGtxiTVN+V5hIzHs8Es8=";
hash = "sha256-ejJ0ihsLdIXbNllDtoi7Yd1u4x61Czxm6d8zJ9Fj7p8=";
};
nativeBuildInputs = [
pkgs/by-name/ng/ngrok/package.nix
+23 -25
View File
@@ -6,35 +6,31 @@
}:
let
versions = lib.importJSON ./versions.json;
arch =
if stdenv.hostPlatform.isi686 then
"386"
else if stdenv.hostPlatform.isx86_64 then
"amd64"
else if stdenv.hostPlatform.isAarch32 then
"arm"
else if stdenv.hostPlatform.isAarch64 then
"arm64"
else
throw "Unsupported architecture";
os =
if stdenv.hostPlatform.isLinux then
"linux"
else if stdenv.hostPlatform.isDarwin then
"darwin"
else
throw "Unsupported os";
versionInfo = versions."${os}-${arch}";
inherit (versionInfo) version sha256 url;
version = "3.39.9";
sources = {
i686-linux = fetchurl {
url = "https://bin.ngrok.com/a/hFGVDX3b1g9/ngrok-v3-3.39.9-linux-386";
hash = "sha256-D4OW6ByClQBO1YtBgydamen19DM5KXsqsgDU954Xtg8=";
};
x86_64-linux = fetchurl {
url = "https://bin.ngrok.com/a/58nxNCjvFS5/ngrok-v3-3.39.9-linux-amd64";
hash = "sha256-0mw/peLKVlzudwAekqGUDr7Lzwz54vitQxmkKaqhvz8=";
};
aarch64-linux = fetchurl {
url = "https://bin.ngrok.com/a/7VJKVAoYV2h/ngrok-v3-3.39.9-linux-arm64";
hash = "sha256-FEpZp6Fq02eH57VKa/5qdpuCcAECqavtOzdO5Q3eYXk=";
};
aarch64-darwin = fetchurl {
url = "https://bin.ngrok.com/a/j4HD3vGPY91/ngrok-v3-3.39.9-darwin-arm64";
hash = "sha256-DsgC5RJWa67rcOdkgwtB737uSnywdAfSCYvjtY1tojY=";
};
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "ngrok";
inherit version;
# run ./update
src = fetchurl { inherit sha256 url; };
src = sources.${stdenv.hostPlatform.system};
sourceRoot = ".";
@@ -57,6 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
platforms = builtins.attrNames sources;
inherit sources;
updateScript = ./update.sh;
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
};
@@ -71,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://ngrok.com/docs/agent/changelog/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
platforms = lib.platforms.unix;
platforms = builtins.attrNames sources;
maintainers = with lib.maintainers; [
bobvanderlinden
brodes
pkgs/by-name/ng/ngrok/update.sh
+59 -26
View File
@@ -1,34 +1,67 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p jq xh
#!nix-shell -i bash -p common-updater-scripts jq nix xh
set -eu -o pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
nixpkgs_root="$(cd "$script_dir/../../../../" && pwd)"
cd "$nixpkgs_root"
get_download_info() {
xh --json \
https://update.ngrok-agent.com/check \
'Accept:application/json; q=1; version=1; charset=utf-8' \
'Content-Type:application/json; charset=utf-8' \
app_id=app_c3U4eZcDbjV \
channel=stable \
os="$1" \
goarm= \
arch="$2" |
jq --arg sys "$1-$2" '{
sys: $sys,
url: .download_url,
sha256: .checksum,
version: .release.version
}'
platform="$1"
os="${platform#*-}"
arch="${platform%%-*}"
case "$arch" in
i686)
arch="386"
;;
x86_64)
arch="amd64"
;;
aarch64)
arch="arm64"
;;
*)
echo "unsupported architecture in platform: $platform" >&2
exit 1
;;
esac
xh --json \
--ignore-stdin \
https://update.ngrok-agent.com/check \
'Accept:application/json; q=1; version=1; charset=utf-8' \
'Content-Type:application/json; charset=utf-8' \
app_id=app_c3U4eZcDbjV \
channel=stable \
os="$os" \
goarm= \
arch="$arch" | jq --raw-output '.release.version + " " + .download_url + " " + .checksum'
}
(
get_download_info linux 386
get_download_info linux amd64
get_download_info linux arm
get_download_info linux arm64
get_download_info darwin amd64
get_download_info darwin arm64
) | jq --slurp 'map ({ (.sys): . }) | add' \
>versions.json
latest_version=
while read -r platform; do
read -r version url checksum < <(get_download_info "$platform")
hash="$(nix hash convert --hash-algo sha256 --to sri "$checksum")"
if [[ -z "$latest_version" ]]; then
latest_version="$version"
elif [[ "$latest_version" != "$version" ]]; then
echo "mismatched versions detected: $latest_version and $version" >&2
exit 1
fi
update-source-version ngrok "$version" "$hash" "$url" --version-key="version" --ignore-same-version --ignore-same-hash --system="$platform" --source-key="sources.$platform" --file="pkgs/by-name/ng/ngrok/package.nix"
done < <(
nix eval --raw --impure --expr "let pkgs = import $nixpkgs_root {}; in builtins.concatStringsSep \"\\n\" pkgs.ngrok.passthru.platforms"
)
if [[ -z "$latest_version" ]]; then
echo "failed to determine latest version" >&2
exit 1
fi
echo "latest version: $latest_version"
pkgs/by-name/ng/ngrok/versions.json
-38
View File
@@ -1,38 +0,0 @@
{
"linux-386": {
"sys": "linux-386",
"url": "https://bin.ngrok.com/a/5AtU98awTaa/ngrok-v3-3.39.5-linux-386",
"sha256": "6aa61bedebbe653013856ce21d0548fbc3448ed1c5832a934e650a9163f23ad5",
"version": "3.39.5"
},
"linux-amd64": {
"sys": "linux-amd64",
"url": "https://bin.ngrok.com/a/cB2psTgibNx/ngrok-v3-3.39.5-linux-amd64",
"sha256": "1488d85d044c0d0b89105881c75ab3f918c58f6b398645835213505f279218e5",
"version": "3.39.5"
},
"linux-arm": {
"sys": "linux-arm",
"url": "https://bin.ngrok.com/a/hwheiurqdR4/ngrok-v3-3.39.5-linux-arm",
"sha256": "075983ff3a5663483f3ed52e4fb6c6642d3be4f829bd24b54f07b3493ca5a84a",
"version": "3.39.5"
},
"linux-arm64": {
"sys": "linux-arm64",
"url": "https://bin.ngrok.com/a/mVUZcKSXYG5/ngrok-v3-3.39.5-linux-arm64",
"sha256": "5ce6dc3b2fd96f0de3ee481a46da0d8f4b2304a57d922a3cc0ed2eaa303d3d83",
"version": "3.39.5"
},
"darwin-amd64": {
"sys": "darwin-amd64",
"url": "https://bin.ngrok.com/a/dk3BUFutK45/ngrok-v3-3.39.5-darwin-amd64",
"sha256": "f0eabc3ac471d82761757c9a32c2482e020e89360f0dd0fafa03c65a3dd8240f",
"version": "3.39.5"
},
"darwin-arm64": {
"sys": "darwin-arm64",
"url": "https://bin.ngrok.com/a/hem5SxTwypP/ngrok-v3-3.39.5-darwin-arm64",
"sha256": "e05361eb605cbb794aa3a0805d3e345c674266117ae72d300442c4d8b0166ef2",
"version": "3.39.5"
}
}
pkgs/by-name/ni/nimble/package.nix
+40 -34
View File
@@ -1,48 +1,54 @@
{
lib,
buildNimPackage,
fetchFromGitHub,
nim,
openssl,
buildNimPackage,
makeWrapper,
nix-update-script,
openssl,
nim,
useSystemNim ? true,
}:
buildNimPackage (finalAttrs: {
buildNimPackage (
final: prev: {
pname = "nimble";
version = "0.20.1";
pname = "nimble";
version = "0.24.1";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nimble";
rev = "v${final.version}";
hash = "sha256-DV/cheAoG0UviYEYqfaonhrAl4MgjDwFqbbKx7jUnKE=";
fetchSubmodules = true;
};
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nimble";
tag = "v${finalAttrs.version}";
hash = "sha256-39d9EsS0opz6vQzSE91gBRQbaTPeebVQLf/QdJoaD8o=";
fetchSubmodules = true;
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ openssl ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ openssl ];
nimFlags = [ "--define:git_revision_override=${final.src.rev}" ];
nimFlags = [ "--define:git_revision_override=${finalAttrs.src.tag}" ];
doCheck = false; # it works on their machine
doCheck = false; # it works on their machine
postInstall = ''
wrapProgram $out/bin/nimble \
--suffix PATH : ${lib.makeBinPath [ nim ]}
'';
postInstall =
let
wrapperFlags = lib.concatStringsSep " " (
[ "--suffix PATH : ${lib.makeBinPath [ nim ]}" ]
++ lib.optionals useSystemNim [
"--add-flag \"--nim:${lib.getExe nim}\""
"--add-flag '--useSystemNim'"
]
);
in
"wrapProgram $out/bin/nimble ${wrapperFlags}";
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script { };
meta = {
description = "Package manager for the Nim programming language";
homepage = "https://github.com/nim-lang/nimble";
changelog = "https://github.com/nim-lang/nimble/releases/tag/v${final.version}";
license = lib.licenses.bsd3;
mainProgram = "nimble";
teams = [ lib.teams.nim ];
};
}
)
meta = {
description = "Package manager for the Nim programming language";
homepage = "https://github.com/nim-lang/nimble";
changelog = "https://github.com/nim-lang/nimble/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd3;
mainProgram = "nimble";
teams = [ lib.teams.nim ];
};
})
pkgs/by-name/no/noaa-apt/fix-shapefile-build-failure.patch
+123
View File
@@ -0,0 +1,123 @@
From 90946a48a12cea4775c3f05bb7f3b206987226ef Mon Sep 17 00:00:00 2001
From: Michal Grzedzicki <lazy404@gmail.com>
Date: Sat, 31 May 2025 00:13:14 +0100
Subject: [PATCH] Bump shapefile to fix time crate build issues
---
Cargo.lock | 34 +++++++++++++++++++++-------------
Cargo.toml | 2 +-
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 80b2846..c3f7de0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "addr2line"
@@ -286,9 +286,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "dbase"
-version = "0.3.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c1a2a9e9238982f599f25b54ec2c7cf1518cc97084cf0c8da475f8a3727fe7"
+checksum = "fbad7f18af09b304e8eb37cede7327d13d7bf6f787e11eef2dc093e26ac30c23"
dependencies = [
"byteorder",
"time",
@@ -296,9 +296,9 @@ dependencies = [
[[package]]
name = "deranged"
-version = "0.3.9"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
dependencies = [
"powerfmt",
]
@@ -1155,6 +1155,12 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-integer"
version = "0.1.45"
@@ -1668,9 +1674,9 @@ dependencies = [
[[package]]
name = "shapefile"
-version = "0.4.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f77dc980d3b70a602ad40a20e9a5137800d5271ce25ec9e2a2826ca24a4be18"
+checksum = "c318c0e76bc2d54086b2d936ae0ca92eab5b84eb73f5704c1d14dba33be643e3"
dependencies = [
"byteorder",
"dbase",
@@ -1851,13 +1857,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.30"
+version = "0.3.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
dependencies = [
"deranged",
"itoa",
"libc",
+ "num-conv",
"num_threads",
"powerfmt",
"serde",
@@ -1867,16 +1874,17 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
[[package]]
name = "time-macros"
-version = "0.2.15"
+version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
dependencies = [
+ "num-conv",
"time-core",
]
diff --git a/Cargo.toml b/Cargo.toml
index 97305cb..863632c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ satellite = { git = "https://github.com/richinfante/satellite-rs", rev = "1f9572
semver = "1.0.20"
serde = { version = "1.0.193", features = ["derive"] }
serde_json = "1.0.108"
-shapefile = "0.4.0"
+shapefile = "0.7.0"
simple_logger = "4.3.0"
toml = "0.7.8"
pkgs/by-name/no/noaa-apt/package.nix
+12 -4
View File
@@ -10,19 +10,25 @@
gtk3,
openssl,
pango,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "noaa-apt";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "martinber";
repo = "noaa-apt";
rev = "v${finalAttrs.version}";
sha256 = "sha256-wmjglF2+BFmlTfvqt90nbCxuldN8AEFXj7y9tgTvA2Y=";
tag = "v${finalAttrs.version}";
sha256 = "sha256-EGbUI9CPgP6Tff2kvIU7pfSlIvyF0yRLo/VlttUn3Rc=";
};
cargoPatches = [
# https://github.com/martinber/noaa-apt/pull/66
./fix-shapefile-build-failure.patch
];
nativeBuildInputs = [
pkg-config
];
@@ -37,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pango
];
cargoHash = "sha256-du44N+G9/nN5YuOpkWXvr1VaSQfjCpZYJ8yDc48ATIU=";
cargoHash = "sha256-y0XBgc7bWZ0lMMlFe7U0UkeIQ//3StwFJNWInNNaAUQ=";
preBuild = ''
# Used by macro pointing to resource location at compile time.
@@ -55,6 +61,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/debian/ar.com.mbernardi.noaa-apt.svg
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "NOAA APT image decoder";
homepage = "https://noaa-apt.mbernardi.com.ar/";
pkgs/by-name/no/noctalia/package.nix
+2
View File
@@ -10,6 +10,7 @@
pkg-config,
wayland-scanner,
makeBinaryWrapper,
autoAddDriverRunpath,
# libraries
cairo,
@@ -79,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
wayland-scanner
makeBinaryWrapper
autoAddDriverRunpath
];
buildInputs = [
pkgs/by-name/nx/nxv/package.nix
+8 -6
View File
@@ -8,17 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nxv";
version = "0.1.4";
version = "0.6.0";
src = fetchFromGitHub {
owner = "utensils";
repo = "nxv";
tag = "v${finalAttrs.version}";
hash = "sha256-714babrR7inR+zkFSk8eqho4GIvUn6ITj7S54i5UcBI=";
fetchSubmodules = true;
hash = "sha256-Ym30QiImry+3Io933SFQw5q6Lyl5p8nuidQhrXHSv54=";
};
cargoHash = "sha256-oc/R/Z0dXqt6JTNCVzejTO2LEuTmiYHdn5WNsxQ8IHQ=";
cargoHash = "sha256-syAlYsXPxMUIyPNankujiVD3lXaAgGmr5v585ysxIWI=";
# Tests use mockito which needs to bind to localhost
__darwinAllowLocalNetworking = true;
@@ -32,14 +31,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Find any version of any Nix package instantly";
longDescription = ''
nxv indexes the entire nixpkgs git history to help you discover
nxv indexes nixpkgs channel releases (2016+) to help you discover
when packages were added, which versions existed, and the exact
commit to use with `nix shell nixpkgs/<commit>#package`.
'';
homepage = "https://nxv.urandom.io";
changelog = "https://github.com/utensils/nxv/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ yiyu ];
maintainers = with lib.maintainers; [
yiyu
jamesbrink
];
mainProgram = "nxv";
};
})
pkgs/by-name/od/odiff/build.zig.zon.nix
-78
View File
@@ -1,78 +0,0 @@
# generated by zon2nix (https://github.com/nix-community/zon2nix)
{
linkFarm,
fetchzip,
fetchgit,
}:
linkFarm "zig-packages" [
{
name = "N-V-__8AAAgPfAB2dLHqe8Vw--VN8ULPqqYFewfk4tobT8ov";
path = fetchgit {
url = "https://github.com/webmproject/libwebp.git";
rev = "23359a1039d054b6e46ca97fa8789a755457fbd5";
hash = "sha256-CrFA9utsqHc5UE8ue6yqMTlUQCjFDpOMYPK6aB0dRd4=";
};
}
{
name = "N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o";
path = fetchzip {
url = "https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz";
hash = "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=";
};
}
{
name = "N-V-__8AAGxifwAAGwXwvsnl_aOXFGLZTeYCu0WBhuEXr96u";
path = fetchgit {
url = "https://github.com/facebook/zstd.git";
rev = "f8745da6ff1ad1e7bab384bd1f9d742439278e99";
hash = "sha256-tNFWIT9ydfozB8dWcmTMuZLCQmQudTFJIkSr0aG7S44=";
};
}
{
name = "N-V-__8AAM5leQDoUCIdk0aoRB23XUlXRCDajkBojfoAcK9q";
path = fetchzip {
url = "https://gitlab.com/libtiff/libtiff/-/archive/57dd777d7f4ec687e067dc51ec99877e774b57fe/libtiff-57dd777d7f4ec687e067dc51ec99877e774b57fe.tar.gz";
hash = "sha256-k3vR3acwdiPw8rwI/U7QKX//8lWZgDypBA2ARabFJHo=";
};
}
{
name = "N-V-__8AAModCAATNPKPcCapFcZFQHw0a8VjUyjAokEkvmW7";
path = fetchzip {
url = "https://github.com/randy408/libspng/archive/refs/tags/v0.7.4.zip";
hash = "sha256-BiRuPQEKVJYYgfUsglIuxrBoJBFiQ0ygQmAFrVvCz4Q=";
};
}
{
name = "N-V-__8AAPdUlQAUAx3gzEYFfTSNog15JPi1d6S5uDyDt-qA";
path = fetchzip {
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.2.zip";
hash = "sha256-tmeWLJxieV42f9ljSpKJoLER4QOYQLsLFC7jW54YZAk=";
};
}
{
name = "imgz-0.2.0-BqHzkKdnCwCNWVkntlBIrAD-_DByuc4fQQN7xy0pB-D6";
path = fetchgit {
url = "https://github.com/shreyassanthu77/imgz.git";
rev = "0ab36f0649772a5dd93d9eab9e7a8a22082a9256";
hash = "sha256-JuYja284173noSQ4r8FkUuVasw7o8eqpRdrd+p7RYRU=";
};
}
{
name = "zlib-1.3.1-ZZQ7lbYMAAB1hTSOKSXAKAgHsfDcyWNH_37ojw5WSpgR";
path = fetchgit {
url = "https://github.com/allyourcodebase/zlib";
rev = "61e7df7e996ec5a5f13a653db3c419adb340d6ef";
hash = "sha256-Z9TlunK+ISlTPbudB63dpkGeQO+5epGdAI4qfBd9ra0=";
};
}
{
name = "zstd-1.5.7-KEItkJ8vAAC5_rRlKmLflYQ-eKXbAIQBWZNmmJtS18q0";
path = fetchgit {
url = "https://github.com/allyourcodebase/zstd.git";
rev = "01327d49cbc56dc24c20a167bb0055d7fc23de84";
hash = "sha256-1w+hR2U9t6R4sNvUMynDsYO0sNAan2svjxjUvxT+x6A=";
};
}
]
pkgs/by-name/od/odiff/package.nix
+16 -6
View File
@@ -3,28 +3,36 @@
stdenv,
installShellFiles,
fetchFromGitHub,
zig_0_15,
callPackage,
zig_0_16,
versionCheckHook,
nasm,
nix-update-script,
}:
let
zig = zig_0_15;
zig = zig_0_16;
in
stdenv.mkDerivation (finalAttrs: {
pname = "odiff";
version = "4.3.8";
version = "4.5.0";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "dmtrKovalenko";
repo = "odiff";
tag = "v${finalAttrs.version}";
hash = "sha256-YiyhhVV73XfVoYCRcYU7PL+Vrcwaf2FINH0W+Ejcu4Q=";
hash = "sha256-kUkt1N21ZuaXBuMFSrQbHgX2ItvSt8CIM3sT4d4bv5c=";
};
zigDeps = zig.fetchDeps {
inherit (finalAttrs) src pname version;
fetchAll = true;
hash = "sha256-12dowp2dcZtvV7t2pZHgMMpywviAMZHFW1N6YG5uaXk=";
};
postConfigure = ''
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
ln -s ${finalAttrs.zigDeps} "$ZIG_GLOBAL_CACHE_DIR/p"
'';
nativeBuildInputs = [
@@ -38,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/dmtrKovalenko/odiff";
description = "SIMD-first image comparison library";
pkgs/by-name/oe/oelint-adv/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "oelint-adv";
version = "9.9.2";
version = "9.10.3";
pyproject = true;
src = fetchFromGitHub {
owner = "priv-kweihmann";
repo = "oelint-adv";
tag = finalAttrs.version;
hash = "sha256-RHW5GfTtwF7vEvnxTU+OyEMgMm0q3w+IjH0u6A3xQh0=";
hash = "sha256-CfgCyo/3c9RGEpp7Ok23+NlTavRdoBNde5DNNRevnMg=";
};
postPatch = ''
pkgs/by-name/ol/ols/package.nix
+2 -8
View File
@@ -8,21 +8,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ols";
version = "dev-2026-05";
version = "dev-2026-06";
src = fetchFromGitHub {
owner = "DanielGavin";
repo = "ols";
tag = finalAttrs.version;
hash = "sha256-9tQVyauvXGTkKnQUSYKAhjL5ZZbhglqdcxdcs27P2k4=";
hash = "sha256-BqLaPVntNzK5N3lffjn4umLhqSM0bOcAVgzk+f13BKM=";
};
patches = [
# Since Odin removed Haiku support in dev-2026-06 and there is still no update
# for ols we're removing the haiku parts so that this builds again
./remove-haiku.patch
];
postPatch = ''
substituteInPlace build.sh \
--replace-fail "-microarch:native" ""
pkgs/by-name/ol/ols/remove-haiku.patch
-43
View File
@@ -1,43 +0,0 @@
diff --git a/src/server/build.odin b/src/server/build.odin
index 1c1f2290..aaf6d2a4 100644
--- a/src/server/build.odin
+++ b/src/server/build.odin
@@ -28,7 +28,6 @@ platform_os: map[string]struct{} = {
"openbsd" = {},
"wasi" = {},
"wasm" = {},
- "haiku" = {},
"netbsd" = {},
"freebsd" = {},
}
@@ -42,7 +41,6 @@ os_enum_to_string: [runtime.Odin_OS_Type]string = {
.WASI = "wasi",
.JS = "js",
.Freestanding = "freestanding",
- .Haiku = "haiku",
.OpenBSD = "openbsd",
.NetBSD = "netbsd",
.Orca = "orca",
@@ -69,8 +67,6 @@ os_string_to_enum: map[string]runtime.Odin_OS_Type = {
"freestanding" = .Freestanding,
"Wasm" = .JS,
"wasm" = .JS,
- "Haiku" = .Haiku,
- "haiku" = .Haiku,
"Openbsd" = .OpenBSD,
"openbsd" = .OpenBSD,
"OpenBSD" = .OpenBSD,
@@ -125,7 +121,12 @@ skip_file :: proc(filename: string) -> bool {
// Finds all packages under the provided path by walking the file system
// and appends them to the provided dynamic array
-append_packages :: proc(path: string, pkgs: ^[dynamic]string, skip: map[string]struct{}, allocator := context.temp_allocator) {
+append_packages :: proc(
+ path: string,
+ pkgs: ^[dynamic]string,
+ skip: map[string]struct{},
+ allocator := context.temp_allocator,
+) {
w := os.walker_create(path)
defer os.walker_destroy(&w)
for info in os.walker_walk(&w) {
pkgs/by-name/op/openbangla-keyboard/0001-skip-enable-language-rust.patch
+14
View File
@@ -0,0 +1,14 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,9 @@ add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}")
set(CMAKE_CXX_STANDARD 17)
if(NOT WIN32)
- enable_language(Rust)
- include(CMakeCargo)
+ find_program(CARGO_EXECUTABLE cargo REQUIRED)
+ find_program(RUSTC_EXECUTABLE rustc REQUIRED)
+ include(CMakeCargo)
endif()
find_package(Qt5 COMPONENTS Widgets Network REQUIRED)
pkgs/by-name/op/openbangla-keyboard/package.nix
+4
View File
@@ -64,6 +64,10 @@ stdenv.mkDerivation (finalAttrs: {
"-DENABLE_IBUS=YES"
];
patches = [
./0001-skip-enable-language-rust.patch
];
cargoRoot = "src/engine/riti";
postPatch = ''
cp ${./Cargo.lock} ${finalAttrs.cargoRoot}/Cargo.lock
pkgs/by-name/op/openctm/package.nix
+7 -3
View File
@@ -4,8 +4,8 @@
fetchurl,
pkg-config,
libglut,
gtk2,
libGLU,
libx11,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -30,14 +30,18 @@ stdenv.mkDerivation (finalAttrs: {
libglut
libGLU
]
++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ];
++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
postPatch =
lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace "tools/tinyxml/Makefile.linux" \
--replace-warn "-Wno-format" "-Wno-format -Wno-format-security"
substituteInPlace "tools/Makefile.linux" \
--replace-warn "-lglut" "-lglut -lGL -lGLU"
--replace-warn "-lglut" "-lglut -lGL -lGLU" \
--replace-fail "all: ctmconv ctmviewer ctmbench" "all: ctmconv ctmbench"
substituteInPlace "Makefile.linux" \
--replace-fail "$""(CP) tools/ctmviewer $""(BINDIR)" "" \
--replace-fail "$""(CP) doc/ctmviewer.1 $""(MAN1DIR)" ""
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace "lib/Makefile.macosx" \
pkgs/by-name/op/openlist/frontend.nix
+4 -4
View File
@@ -12,18 +12,18 @@
}:
buildNpmPackage (finalAttrs: {
pname = "openlist-frontend";
version = "4.2.3";
version = "4.2.4";
src = fetchFromGitHub {
owner = "OpenListTeam";
repo = "OpenList-Frontend";
tag = "v${finalAttrs.version}";
hash = "sha256-33W0JCAmt3pjhAAOxoaZS7zBbJJbl4i85fqyKzoibz8=";
hash = "sha256-Xw/nMgNLIuNvfwZ0qJhHcTLfmlk4dQk5HgIGuBYUhtY=";
};
i18n = fetchzip {
url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
hash = "sha256-nnsnYXbH4Uq+sux11txanUs11MB2dHIT0vCLMIzYQdg=";
hash = "sha256-YXkwy9usUFK9o958AP+eeZuFGEGgpXIRDjnn06VQIJk=";
stripRoot = false;
};
@@ -41,7 +41,7 @@ buildNpmPackage (finalAttrs: {
inherit (finalAttrs) pname version src;
pnpm = openlistPnpm;
fetcherVersion = 4;
hash = "sha256-V+YhQsfUvd8WHxIYEjuihEjTZE75eFfziq2GwW1rPbg=";
hash = "sha256-R1abgVxkxCGCtC47Knrnv959JUy0NVadJBxlzg8sDPw=";
};
npmConfigHook = pnpmConfigHook;
pkgs/by-name/op/openlist/package.nix
+3 -3
View File
@@ -12,13 +12,13 @@
buildGoModule (finalAttrs: {
pname = "openlist";
version = "4.2.3";
version = "4.2.4";
src = fetchFromGitHub {
owner = "OpenListTeam";
repo = "OpenList";
tag = "v${finalAttrs.version}";
hash = "sha256-q7s6u/pQ+bvSbz19029uO9CzVc1KVoISpcStngVUffs=";
hash = "sha256-dev6hUxJ8y1TjDy9ecCKnUe9d9PLkgVxvoSggahT8I8=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
frontend = callPackage ./frontend.nix { };
proxyVendor = true;
vendorHash = "sha256-a4v2JP/+feit3uTqnACWgl77fWZU8yVE/0Hm7qxoI8E=";
vendorHash = "sha256-YRIadkUlp8u36E/g2/+3469BG9pwAWNl8JgF5yQbCEY=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/ow/owntone/package.nix
+2 -2
View File
@@ -37,14 +37,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "29.2";
version = "29.3";
pname = "owntone";
src = fetchFromGitHub {
owner = "owntone";
repo = "owntone-server";
tag = finalAttrs.version;
hash = "sha256-cCbCShIgopm3HhNVyvr6Q8fe8LkxwNE/51/0qkS27WE=";
hash = "sha256-a7OpRQBzeOcZEINRxWvOlbmKCXFBtQTk9nMJAUkCqgM=";
};
nativeBuildInputs = [
pkgs/by-name/pr/pretix/package.nix
+2 -2
View File
@@ -55,14 +55,14 @@ let
in
pythonPackages.buildPythonApplication (finalAttrs: {
pname = "pretix";
version = "2026.6.0";
version = "2026.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
tag = "v${finalAttrs.version}";
hash = "sha256-yKJGJziMpOB8ttz0n4USay03wJTId77bYT7id4OgoIE=";
hash = "sha256-P8anV87K/UFOCztGz8iNb5NbmAC3JkFqAm8vKXkr0qY=";
};
patches = [
pkgs/by-name/pr/probe-rs-tools/package.nix
+4 -4
View File
@@ -20,16 +20,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "probe-rs-tools";
version = "0.31.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "probe-rs";
repo = "probe-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-ZcH2FBKsbBtTYfRQgPfOOODDpyB7VydcO7F7pq8xzD0=";
hash = "sha256-C6ioLkU0tmCzWtThPGyOOiD/Z9n8RB5eogAxTmBwDj8=";
};
cargoHash = "sha256-fVmwZw34lK6eKkqNT/SW5wzeeyWg6Qp48eso6yibICE=";
cargoHash = "sha256-Sfx8n9+Q9wplfnFenavoCWSaO7nlcAmRpxyyKe5Il6A=";
buildAndTestSubdir = finalAttrs.pname;
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=cmd::dap_server::server::debugger::test::disassemble::positive_byte_offset_that_lands_in_the_middle_of_an_instruction_unaligned_"
"--skip=cmd::dap_server::server::debugger::test::launch_and_threads"
"--skip=cmd::dap_server::server::debugger::test::launch_with_config_error"
"--skip=cmd::dap_server::server::debugger::test::test_initalize_request"
"--skip=cmd::dap_server::server::debugger::test::test_initialize_request"
"--skip=cmd::dap_server::server::debugger::test::test_launch_and_terminate"
"--skip=cmd::dap_server::server::debugger::test::test_launch_no_probes"
"--skip=cmd::dap_server::server::debugger::test::wrong_request_after_init"
pkgs/by-name/pr/prowlarr/deps.json
Generated
+24 -14
View File
@@ -1,8 +1,8 @@
[
{
"pname": "AngleSharp",
"version": "1.4.0",
"hash": "sha256-xHpoMkhYSj7ejeMmI2e7ygef84QGZhttPjYOnLjITd0="
"version": "1.5.2",
"hash": "sha256-81rDtnwvR0SDXNNUnPirWIa782gwkgRlz1Fbzm2ywwc="
},
{
"pname": "AngleSharp.Xml",
@@ -111,8 +111,8 @@
},
{
"pname": "MailKit",
"version": "4.16.0",
"hash": "sha256-4yyFxq8pJVTIgAJkyAYcuV2+/ZirENgUSk1OSD/gKIo="
"version": "4.17.0",
"hash": "sha256-LGruedMrHrI0AXHcXOFxsYP2awwPbrC9Q41AeQk4+9U="
},
{
"pname": "Microsoft.ApplicationInsights",
@@ -151,8 +151,8 @@
},
{
"pname": "Microsoft.Data.SqlClient",
"version": "6.1.5",
"hash": "sha256-XpGL/oKQWn+FmYNmKB6CMmWbPEuCDX/xdOMqljS0vvs="
"version": "6.1.6",
"hash": "sha256-VH1VbBC4ywqSF/RxaMeYivH1DdKdXbk9wGrbvJLNKcc="
},
{
"pname": "Microsoft.Data.SqlClient.SNI.runtime",
@@ -346,14 +346,24 @@
},
{
"pname": "Microsoft.Identity.Client",
"version": "4.80.0",
"hash": "sha256-vtuXCu0ykTYJjvlSSWMjC9EGJQXZ1dqgpaMeD4FmlGQ="
"version": "4.84.2",
"hash": "sha256-pYMBMwhrWf/uIVNfov3RpmEAFlkR+fpskUWMf6HlU1M="
},
{
"pname": "Microsoft.Identity.Client.Broker",
"version": "4.84.2",
"hash": "sha256-yRULIJvCTiA/pHJgeC8t8wpGfj5VttLJwQt8IOOV9o0="
},
{
"pname": "Microsoft.Identity.Client.Extensions.Msal",
"version": "4.78.0",
"hash": "sha256-0s9wa8HkFhnzmAz+TGxtA3qTX3dZiIoPcTWGLgY8mAg="
},
{
"pname": "Microsoft.Identity.Client.NativeInterop",
"version": "0.20.6",
"hash": "sha256-PbaN21Juuh5fnfp84uX+QtGXJ0NmFGEQE/WjylnWD8M="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "7.7.1",
@@ -491,8 +501,8 @@
},
{
"pname": "MimeKit",
"version": "4.16.0",
"hash": "sha256-yWGXVm+EHvBSsZlVHdWdD+rVwdf/5hHxsUfJMSd2Afo="
"version": "4.17.0",
"hash": "sha256-GpWv+8shoprshuPNB+H+C5saffiKQ6Pek3zhLUGklRo="
},
{
"pname": "Mono.Nat",
@@ -587,8 +597,8 @@
},
{
"pname": "Polly",
"version": "8.6.6",
"hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps="
"version": "8.7.0",
"hash": "sha256-iMNusWW+4nuIvkNLUaoru23Roe9vpC140TOIHbLvewE="
},
{
"pname": "Polly.Contrib.WaitAndRetry",
@@ -597,8 +607,8 @@
},
{
"pname": "Polly.Core",
"version": "8.6.6",
"hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU="
"version": "8.7.0",
"hash": "sha256-1AT4Xym9hn2Awgul9WErwXk2bBPN58P9XfRExrIPItg="
},
{
"pname": "RestSharp",
pkgs/by-name/pr/prowlarr/package.nix
+2 -2
View File
@@ -20,7 +20,7 @@
applyPatches,
}:
let
version = "2.4.0.5397";
version = "2.5.2.5491";
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
# the already patched lockfile to `fetchYarnDeps`.
src = applyPatches {
@@ -28,7 +28,7 @@ let
owner = "Prowlarr";
repo = "Prowlarr";
tag = "v${version}";
hash = "sha256-cLFzCPSG0cB2K3KPNrN0zNnmZMEX3olJajNFGxmYoAM=";
hash = "sha256-Q99GbNiMeofccrxfrLPlzns0u3Fy7qFobwPgHNnvG7Q=";
};
postPatch = ''
mv src/NuGet.config NuGet.Config
pkgs/by-name/qb/qbit-manage/package.nix
+5 -7
View File
@@ -7,13 +7,13 @@
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "qbit-manage";
version = "4.9.1";
version = "4.11.0";
src = fetchFromGitHub {
owner = "StuffAnThings";
repo = "qbit_manage";
tag = "v${finalAttrs.version}";
hash = "sha256-iS6DiyPqRQo/NVczumZx06VYrWgCv+w9OK4jHDKE8PQ=";
hash = "sha256-3HYxrFvte38ZKcKJOW86Yp1nGvEvzmflapNkVd9hSGg=";
};
pyproject = true;
@@ -40,11 +40,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
];
pythonRelaxDeps = [
"croniter"
"fastapi"
"qbittorrent-api"
"requests"
"uvicorn"
"bencode.py"
"gitpython"
"humanize"
];
passthru = {
pkgs/by-name/qu/quantframe/0002-sync-node-packages.patch
-149
View File
@@ -1,149 +0,0 @@
diff --git a/package.json b/package.json
index d2ca05f1..37693a7b 100644
--- a/package.json
+++ b/package.json
@@ -25,11 +25,11 @@
"@mantine/notifications": "8.3.8",
"@mantine/tiptap": "8.3.8",
"@tanstack/react-query": "^5.64.1",
- "@tauri-apps/api": "^2.0.0",
+ "@tauri-apps/api": "2.6.0",
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
"@tauri-apps/plugin-dialog": "~2",
- "@tauri-apps/plugin-fs": "~2",
- "@tauri-apps/plugin-http": "~2",
+ "@tauri-apps/plugin-fs": "2.3.0",
+ "@tauri-apps/plugin-http": "2.4.4",
"@tauri-apps/plugin-notification": "~2",
"@tauri-apps/plugin-os": "~2",
"@tauri-apps/plugin-process": "~2",
@@ -66,4 +66,4 @@
"vite": "^4.5.0",
"vite-plugin-svgr": "^2.4.0"
}
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 531c77f5..dc542aca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,8 +48,8 @@ importers:
specifier: ^5.64.1
version: 5.64.1(react@18.3.1)
'@tauri-apps/api':
- specifier: ^2.0.0
- version: 2.0.0
+ specifier: 2.6.0
+ version: 2.6.0
'@tauri-apps/plugin-clipboard-manager':
specifier: ^2.3.0
version: 2.3.0
@@ -57,11 +57,11 @@ importers:
specifier: ~2
version: 2.2.0
'@tauri-apps/plugin-fs':
- specifier: ~2
- version: 2.2.0
+ specifier: 2.3.0
+ version: 2.3.0
'@tauri-apps/plugin-http':
- specifier: ~2
- version: 2.2.0
+ specifier: 2.4.4
+ version: 2.4.4
'@tauri-apps/plugin-notification':
specifier: ~2
version: 2.2.1
@@ -767,11 +767,8 @@ packages:
peerDependencies:
react: ^18 || ^19
- '@tauri-apps/api@2.0.0':
- resolution: {integrity: sha512-moKgCp2EX7X5GiOx/G/bmoEpkFQVVmyS98UaJU4xUVzan+E1BdwlAKcbip+cGldshYOqL4JSwAEN1OkRXeug0Q==}
-
- '@tauri-apps/api@2.7.0':
- resolution: {integrity: sha512-v7fVE8jqBl8xJFOcBafDzXFc8FnicoH3j8o8DNNs0tHuEBmXUDqrCOAzMRX0UkfpwqZLqvrvK0GNQ45DfnoVDg==}
+ '@tauri-apps/api@2.6.0':
+ resolution: {integrity: sha512-hRNcdercfgpzgFrMXWwNDBN0B7vNzOzRepy6ZAmhxi5mDLVPNrTpo9MGg2tN/F7JRugj4d2aF7E1rtPXAHaetg==}
'@tauri-apps/cli-darwin-arm64@2.2.5':
resolution: {integrity: sha512-qdPmypQE7qj62UJy3Wl/ccCJZwsv5gyBByOrAaG7u5c/PB3QSxhNPegice2k4EHeIuApaVJOoe/CEYVgm/og2Q==}
@@ -844,11 +841,11 @@ packages:
'@tauri-apps/plugin-dialog@2.2.0':
resolution: {integrity: sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==}
- '@tauri-apps/plugin-fs@2.2.0':
- resolution: {integrity: sha512-+08mApuONKI8/sCNEZ6AR8vf5vI9DXD4YfrQ9NQmhRxYKMLVhRW164vdW5BSLmMpuevftpQ2FVoL9EFkfG9Z+g==}
+ '@tauri-apps/plugin-fs@2.3.0':
+ resolution: {integrity: sha512-G9gEyYVUaaxhdRJBgQTTLmzAe0vtHYxYyN1oTQzU3zwvb8T+tVLcAqCdFMWHq0qGeGbmynI5whvYpcXo5LvZ1w==}
- '@tauri-apps/plugin-http@2.2.0':
- resolution: {integrity: sha512-ZY6sIHhgu8hcu6BkkegoiOEbvOsQFSVcK8J7l+g9RNHrkhl5uzpNIytR4R/H50fj7gyG80DJvrXDx/LBo7Easw==}
+ '@tauri-apps/plugin-http@2.4.4':
+ resolution: {integrity: sha512-IjlaaS4z8ybB10qnh6djZ2FIaHdWVs/U1D1C56udKcjX1f+jAmR8/s7qBV5cv/OmcGkOIzet3LWuH70LKf4J2A==}
'@tauri-apps/plugin-notification@2.2.1':
resolution: {integrity: sha512-QF8Zod6XDhxD6xkD5nU/BjbOpJ6+3gxGCrVULOdLpvMuMSN2Z2IdObV/qgnrEJk1UamUCF1ClQUqNCbk4zTJNQ==}
@@ -2835,9 +2832,7 @@ snapshots:
'@tanstack/query-core': 5.64.1
react: 18.3.1
- '@tauri-apps/api@2.0.0': {}
-
- '@tauri-apps/api@2.7.0': {}
+ '@tauri-apps/api@2.6.0': {}
'@tauri-apps/cli-darwin-arm64@2.2.5':
optional: true
@@ -2884,39 +2879,39 @@ snapshots:
'@tauri-apps/plugin-clipboard-manager@2.3.0':
dependencies:
- '@tauri-apps/api': 2.7.0
+ '@tauri-apps/api': 2.6.0
'@tauri-apps/plugin-dialog@2.2.0':
dependencies:
- '@tauri-apps/api': 2.0.0
+ '@tauri-apps/api': 2.6.0
- '@tauri-apps/plugin-fs@2.2.0':
+ '@tauri-apps/plugin-fs@2.3.0':
dependencies:
- '@tauri-apps/api': 2.0.0
+ '@tauri-apps/api': 2.6.0
- '@tauri-apps/plugin-http@2.2.0':
+ '@tauri-apps/plugin-http@2.4.4':
dependencies:
- '@tauri-apps/api': 2.0.0
+ '@tauri-apps/api': 2.6.0
'@tauri-apps/plugin-notification@2.2.1':
dependencies:
- '@tauri-apps/api': 2.0.0
+ '@tauri-apps/api': 2.6.0
'@tauri-apps/plugin-os@2.2.1':
dependencies:
- '@tauri-apps/api': 2.0.0
+ '@tauri-apps/api': 2.6.0
'@tauri-apps/plugin-process@2.2.0':
dependencies:
- '@tauri-apps/api': 2.0.0
+ '@tauri-apps/api': 2.6.0
'@tauri-apps/plugin-shell@2.2.0':
dependencies:
- '@tauri-apps/api': 2.0.0
+ '@tauri-apps/api': 2.6.0
'@tauri-apps/plugin-updater@2.9.0':
dependencies:
- '@tauri-apps/api': 2.7.0
+ '@tauri-apps/api': 2.6.0
'@tiptap/core@3.6.2(@tiptap/pm@3.6.2)':
dependencies:
pkgs/by-name/qu/quantframe/package.nix
+6 -7
View File
@@ -20,13 +20,13 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "quantframe";
version = "1.6.12";
version = "1.6.26";
src = fetchFromGitHub {
owner = "Kenya-DK";
repo = "quantframe-react";
tag = "v${finalAttrs.version}";
hash = "sha256-IF+8filOXG+4nWpivyYknkT+hAg8nhG10Hfm79/m3Uc=";
hash = "sha256-bGfhA8xFz9hTcway9PlRd1TCwC6sDZHnSmdEWoh3zU0=";
};
postPatch = ''
@@ -34,12 +34,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
substituteInPlace src-tauri/tauri.conf.json \
--replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false'
--replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false'
'';
patches = [
./0001-disable-telemetry.patch
./0002-sync-node-packages.patch
];
pnpmDeps = fetchPnpmDeps {
@@ -51,10 +50,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-omomvnHUiEfGVJn6LApWOnRwSVO8kpMLN3Jz0MhwPpQ=";
hash = "sha256-TAghp3rBySgNpzZ8ruG9jBO0BLcR3QhWK2XJ9C7VcuA=";
};
cargoHash = "sha256-Ffy7dutFVQNZUFm9/iW0qPqUJ9bbRW6PeuC3eNNqfk8=";
cargoHash = "sha256-t/qGNyjMOg1+H2zFmKGw8fvwhzi72q0eq8g3pjtvL80=";
nativeBuildInputs = [
cargo-tauri.hook
@@ -84,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Warframe Market listings and transactions manager";
mainProgram = "quantframe";
mainProgram = "Quantframe";
homepage = "https://quantframe.app/";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
pkgs/by-name/ru/rufin/package.nix
+6 -7
View File
@@ -3,7 +3,7 @@
fetchFromGitHub,
rustPlatform,
cacert,
gdk-pixbuf,
glib,
gettext,
gst_all_1,
gtk4,
@@ -14,7 +14,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rufin";
version = "0.8.0";
version = "0.9.0";
__structuredAttrs = true;
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "screwys";
repo = "Rufin";
tag = "v${finalAttrs.version}";
hash = "sha256-N2JM0sRg32lQhRhajwfla0SVhxBgEp5cVEetFOXBqKE=";
hash = "sha256-VYuM0SAAvoQ/H4dufgoPFNIYwwEjpctqiElrKPi5D+E=";
};
cargoHash = "sha256-1KTEVLqlvgUO02hLnTbqjdfPS5z8Ra6qQG5s5H0S2fY=";
cargoHash = "sha256-a0VPqbw2rjOzRjYpk8NoI2mq9LxFd6BBJ/AmE3tyVR4=";
strictDeps = true;
@@ -36,8 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
buildInputs = [
gdk-pixbuf
gettext
glib
gtk4
libadwaita
]
@@ -75,7 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
install -Dm644 -t "$out/share/icons/hicolor/64x64/apps" \
data/icons/hicolor/64x64/apps/*.png
for po_file in locales/*.po; do
for po_file in crates/localization/locales/*.po; do
if [ -f "$po_file" ]; then
lang="$(basename "$po_file" .po)"
mkdir -p "$out/share/locale/$lang/LC_MESSAGES"
pkgs/by-name/se/seamonkey/package.nix
+2 -2
View File
@@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "seamonkey";
version = "2.53.23";
version = "2.53.24";
strictDeps = true;
__structuredAttrs = true;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
# Upstream requires highly deprecated build tools to compile from source
src = fetchurl {
url = "https://archive.seamonkey-project.org/releases/${version}/linux-x86_64/en-US/seamonkey-${version}.en-US.linux-x86_64.tar.bz2";
sha256 = "1si5vqprq7hgm366db76yziqxcqdvxj675kgxb6lp2ppprl8rlkw";
sha256 = "sha256-Y/vh0PXKNbsijkfrWGqBxXh96/vCeiQhKeqeEzQp2Cw=";
};
nativeBuildInputs = [
pkgs/by-name/se/segger-jlink/source.nix
+6 -6
View File
@@ -1,33 +1,33 @@
{
version = "874";
version = "952";
x86_64-linux = {
os = "Linux";
name = "x86_64";
ext = "tgz";
hash = "sha256-7Ny7G0DXhYTf6MYLmEUT7meYPNMrGLPDdvrVuYyETWA=";
hash = "sha256-Nhsu/5RX/c/uSVw9im0K204TjOvm4B7zKFILOmGG7w8=";
};
i686-linux = {
os = "Linux";
name = "i386";
ext = "tgz";
hash = "sha256-pJ/2KSfoxvXMqAtlXbSXbxGh3zQec0zfZsEbdRw+CMU=";
hash = "sha256-4nxRdHjX2iU+v4yE3nhPT1BV/edEmOgV7itmWukWRyw=";
};
aarch64-linux = {
os = "Linux";
name = "arm64";
ext = "tgz";
hash = "sha256-IgX30NgPAkQ4nsJRbVqTcW7y8XN8prmpG+/S0dpJriE=";
hash = "sha256-MFBQpgtE9PA6sXbQV+YOEavvB2vtZ9NOP59EhccLWHw=";
};
armv7l-linux = {
os = "Linux";
name = "arm";
ext = "tgz";
hash = "sha256-ZU4ibaO0Kg6/fVCthsV+scWdJuENcUHi187XN8OOdcw=";
hash = "sha256-KoSgRi8+EQakf+IF5jUx9OWha9cQWbFBC5Rn1Awy9zg=";
};
aarch64-darwin = {
os = "MacOSX";
name = "arm64";
ext = "pkg";
hash = "sha256-wfK9cV2Ul3LGmqTwerS1+BR0BuhmCFZdXtWykwJqWCM=";
hash = "sha256-uglfWXxoKC4yZ/2N4LUFp6ZZin//yWkdtO6LyFv/MkE=";
};
}
pkgs/by-name/se/segger-jlink/update.py
+1 -1
View File
@@ -30,7 +30,7 @@ def find_latest_jlink_version() -> str:
soup = BeautifulSoup(response.text, 'html.parser')
jlink_download_tile = soup.find(lambda tag: tag.name == 'tbody' and "J-Link Software and Documentation pack" in tag.text)
jlink_download_tile = soup.find(lambda tag: tag.name == 'tbody' and "J-Link Software and Documentation Pack" in tag.text)
version_select = jlink_download_tile.find('select')
version = next(o.text for o in version_select.find_all('option'))
pkgs/by-name/sl/slskd/deps.json
Generated
+244 -1109
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/sl/slskd/package.nix
+5 -5
View File
@@ -19,13 +19,13 @@ let
in
buildDotnetModule rec {
pname = "slskd";
version = "0.24.5";
version = "0.26.0";
src = fetchFromGitHub {
owner = "slskd";
repo = "slskd";
tag = version;
hash = "sha256-B0LAd9Fn1E5heGPk5dd7DoHWreHRxe42Xew5PmLId7g=";
hash = "sha256-9Ynji8x2JfwbLDtp/U7pmTmLACXc7XZO8CD7s4oOXbg=";
};
nativeBuildInputs = [
@@ -40,14 +40,14 @@ buildDotnetModule rec {
name = "${pname}-${version}-npm-deps";
inherit src;
sourceRoot = "${src.name}/${npmRoot}";
hash = "sha256-hmN91Y9ePJ7ZUyQX8jJbOgf0SuhsgmhO1ifi4sWhPUM=";
hash = "sha256-HagCY1xxW0dC5OGpySi3spf3jSLS6+GfTkrzLBMiy+I=";
};
projectFile = "slskd.sln";
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;
testProjectFile = "tests/slskd.Tests.Unit/slskd.Tests.Unit.csproj";
doCheck = true;
pkgs/by-name/sn/snowemu/package.nix
+43 -25
View File
@@ -3,8 +3,9 @@
rustPlatform,
fetchFromGitHub,
makeWrapper,
copyDesktopItems,
makeDesktopItem,
SDL2,
alsa-lib,
pkg-config,
libxrandr,
libxi,
@@ -13,42 +14,49 @@
wayland,
libxkbcommon,
libGL,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "snowemu";
version = "1.3.0";
version = "1.5.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "twvd";
repo = "snow";
tag = "v${finalAttrs.version}";
hash = "sha256-/arxD1bShXqsC2If2v7ARBsjdlnhlg0wK6MLX0q4xiI=";
hash = "sha256-BA4uCuluSfIGXwBxE2X6Gke0ITsYEPzKoFDwx6jRYsk=";
fetchSubmodules = true;
};
cargoHash = "sha256-7cyhpiT6RL+5x+xslQzhA5W71rcZ9TJPmfUHKl7TC/M=";
cargoHash = "sha256-C7rCx0g77R+1f0la+j3pVW0bShGPdJD3btAIYg3yzMw=";
nativeBuildInputs = [
pkg-config
makeWrapper
copyDesktopItems
];
buildInputs = [
SDL2.dev
libx11
libxcursor
libxrandr
libxi
];
buildInputs = [ alsa-lib ];
postInstall = ''
mv $out/bin/snow_frontend_egui $out/bin/snowemu
install -Dm644 assets/snow_icon.png $out/share/icons/snowemu.png
substituteInPlace assets/dev.thomasw.snow.metainfo.xml \
--replace-fail "snow.desktop" "snowemu.desktop" \
--replace-fail "/usr/share/icons/hicolor/1024x1024/apps/snow_icon.png" \
"$out/share/icons/snowemu.png"
install -Dm644 assets/dev.thomasw.snow.metainfo.xml \
$out/share/metainfo/dev.thomasw.snow.metainfo.xml
wrapProgram $out/bin/snowemu \
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
libx11
libxcursor
libxrandr
libxi
wayland
libxkbcommon
libGL
@@ -56,18 +64,28 @@ rustPlatform.buildRustPackage (finalAttrs: {
}
'';
desktopItems = makeDesktopItem {
name = "snowemu";
exec = "snowemu";
icon = "snowemu";
desktopName = "Snow Emulator";
comment = finalAttrs.meta.description;
genericName = "Vintage Macintosh emulator";
categories = [
"Game"
"Emulator"
];
};
desktopItems = [
(makeDesktopItem {
name = "snowemu";
exec = "snowemu";
icon = "snowemu";
desktopName = "Snow Emulator";
comment = finalAttrs.meta.description;
genericName = "Vintage Macintosh emulator";
categories = [
"Game"
"Emulator"
];
keywords = [
"macintosh"
"emulator"
"vintage"
"68k"
];
})
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Early Macintosh emulator";
pkgs/by-name/ta/tauon/package.nix
+27 -4
View File
@@ -24,13 +24,11 @@
wavpack,
ffmpeg,
pulseaudio,
rustPlatform,
withDiscordRPC ? true,
}:
python3Packages.buildPythonApplication rec {
pname = "tauon";
let
version = "10.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Taiko2k";
repo = "Tauon";
@@ -38,6 +36,28 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-atLyNePy3pc3xJFliy5hITC5R0VU6jfHYqfq8RxqGoM=";
};
lrclib-solver = rustPlatform.buildRustPackage {
pname = "lrclib-solver";
inherit version;
src = "${src}/src/lrclib-solver";
cargoHash = "sha256-uNEf0d462W9mJHGLeAE/aLjpyzKT5orKZ7BYQ+53msY=";
meta = {
mainProgram = "lrclib-solver";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [
jansol
alfarel
];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
};
in
python3Packages.buildPythonApplication {
pname = "tauon";
pyproject = true;
inherit version src;
postUnpack = ''
rmdir source/src/phazor/kissfft
ln -s ${kissfft.src} source/src/phazor/kissfft
@@ -136,8 +156,11 @@ python3Packages.buildPythonApplication rec {
install -Dm755 extra/tauonmb.desktop $out/share/applications/tauonmb.desktop
mkdir -p $out/share/icons/hicolor/scalable/apps
install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps
ln -s ${lib.getExe lrclib-solver} $out/${python3Packages.python.sitePackages}/tauon/lrclib-solver
'';
passthru = { inherit lrclib-solver; };
meta = {
description = "Linux desktop music player from the future";
mainProgram = "tauon";
pkgs/by-name/te/technitium-dns-server-library/package.nix
+2 -2
View File
@@ -6,7 +6,7 @@
}:
buildDotnetModule (finalAttrs: {
pname = "technitium-dns-server-library";
version = "15.3.0";
version = "15.4.0";
__structuredAttrs = true;
@@ -14,7 +14,7 @@ buildDotnetModule (finalAttrs: {
owner = "TechnitiumSoftware";
repo = "TechnitiumLibrary";
tag = "dns-server-v${finalAttrs.version}";
hash = "sha256-BQWDzMEiChY8uX1wUUZNWFDomGqUyDrZ6+UEncC5G5U=";
hash = "sha256-h6EXPJTlYatT5IiFrIsZC/LJ5exzAAU8H4DZCimkn7Q=";
};
dotnet-sdk = dotnetCorePackages.sdk_10_0;
pkgs/by-name/te/technitium-dns-server/package.nix
+2 -2
View File
@@ -9,7 +9,7 @@
}:
buildDotnetModule (finalAttrs: {
pname = "technitium-dns-server";
version = "15.3.0";
version = "15.4.0";
__structuredAttrs = true;
@@ -17,7 +17,7 @@ buildDotnetModule (finalAttrs: {
owner = "TechnitiumSoftware";
repo = "DnsServer";
tag = "v${finalAttrs.version}";
hash = "sha256-nopmnQpozvN0p/SyUCH3Yej/oAhDvNdfJssUA1JyGsk=";
hash = "sha256-EPqaVulPO5giURtlmj4vMDXYFKICrhJa9TQbQ9AaYJ8=";
};
dotnet-sdk = dotnetCorePackages.sdk_10_0;
pkgs/by-name/ti/tinyauth/package.nix
+4 -4
View File
@@ -14,16 +14,16 @@
buildGoModule (finalAttrs: {
pname = "tinyauth";
version = "5.1.1";
version = "5.1.2";
src = fetchFromGitHub {
owner = "tinyauthapp";
repo = "tinyauth";
tag = "v${finalAttrs.version}";
hash = "sha256-leXqelsPCLixhxqJbL7aDgGIzj1KcZMnR/1UxRPa1bo=";
hash = "sha256-L19CTiEMqyc8f0IyLFzCBnRruZfzGbCeDtvgsWzKVjI=";
};
vendorHash = "sha256-rlMttXywppA39Vip6pIos4tY5434vvtN8dbhVn+S2Kg=";
vendorHash = "sha256-qugLh2PGdKF63/3flVHLAwbvbSJh/lpvDpcNQqz1HZM=";
subPackages = [ "cmd/tinyauth" ];
@@ -55,7 +55,7 @@ buildGoModule (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/frontend";
pnpm = pnpm_11;
fetcherVersion = 4;
hash = "sha256-WLPJ1ZH2mEoQKFa6F5TOmTfbcgN5lXKZZHHvgI4mMq4=";
hash = "sha256-f42uvVccZ6/sMIpVLycqEXW08R5jkaE5V15CItSbN9o=";
};
pnpmRoot = "frontend";
pkgs/by-name/tr/trezor-suite/package.nix
+3 -3
View File
@@ -10,7 +10,7 @@
let
pname = "trezor-suite";
version = "26.6.1";
version = "26.7.2";
suffix =
{
@@ -24,8 +24,8 @@ let
hash =
{
# curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
aarch64-linux = "sha512-okUyoPX7ZzIRNiGW2OiLIi+tg2HIVqfyyGOC5caIX3D7STOcYmoEN6MO5VXTWizF422gwvHn2YKuL2eDkFC7Pw==";
x86_64-linux = "sha512-JNcPST+HP63v4FcxS0NIWhQ5FsXMUxetd5g4KpHyipTUBUwtLdNIg7K6t5GI+w2XdAGEkSvCGmwL0gJ+/DMQRA==";
aarch64-linux = "sha512-5lKIWbEm/z3B1CEN9xepqpPauhd8x1gOkKKk+/W7iyqJbn/G1iDZ+1rs2nHFPmLW5TP5xYpmN9qurxgBGqFzNA==";
x86_64-linux = "sha512-0aBQ2K91+SH4eKVVFyGvX7g1DhRATx/KuIRxw8B0+JZR1Pj6ZzQsk/FgnVAlU7Odsyo4TbGTVdD13JETepxliQ==";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
pkgs/by-name/we/wezterm/package.nix
+14 -4
View File
@@ -24,6 +24,7 @@
libxcb-keysyms,
libxcb-wm,
zlib,
rcodesign,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -66,7 +67,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
pkg-config
python3
]
++ lib.optional stdenv.hostPlatform.isDarwin perl;
++ lib.optionals stdenv.hostPlatform.isDarwin [
perl
rcodesign
];
buildInputs = [
fontconfig
@@ -115,15 +119,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
OUT_APP="$out/Applications/WezTerm.app"
cp -r assets/macos/WezTerm.app "$OUT_APP"
rm $OUT_APP/*.dylib
cp -r assets/shell-integration/* "$OUT_APP"
# macos codesigning requires a specific directory structure
# see also: https://github.com/wezterm/wezterm/blob/76b606ec597a3c0263fa60321548637451c0a547/ci/deploy.sh#L31
mkdir -p $OUT_APP/Contents/{MacOS,Resources}
cp -r assets/shell-integration/* $OUT_APP/Contents/Resources/
# https://github.com/wezterm/wezterm/pull/6886
# macOS will only recognize our application bundle
# if the binaries are inside of it. Move them there
# and create symbolic links for them in bin/.
mv $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
ln -s "$OUT_APP"/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$out/bin"
mv $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} $OUT_APP/Contents/MacOS/
ln -s $OUT_APP/Contents/MacOS/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} $out/bin
'';
# notifications require that the app bundle be codesigned (beyond the linker-signing that happens automatically for the executable)
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin "rcodesign sign $out/Applications/WezTerm.app";
passthru = {
# the headless variant is useful when deploying wezterm's mux server on remote severs
headless = import ./headless.nix {
pkgs/development/interpreters/python/mk-python-derivation.nix
+13 -24
View File
@@ -94,6 +94,16 @@ let
"wheel"
];
bootstrappedPypaBuildHook = pypaBuildHook.override {
inherit (python.pythonOnBuildForHost.pkgs.bootstrap) build;
wheel = null;
};
bootstrappedPypaInstallHook = pypaInstallHook.override {
inherit (python.pythonOnBuildForHost.pkgs.bootstrap) installer;
};
bootstrappedRuntimeDepsCheckHook = pythonRuntimeDepsCheckHook.override {
inherit (python.pythonOnBuildForHost.pkgs.bootstrap) packaging;
};
in
lib.extendMkDerivation {
@@ -282,13 +292,7 @@ lib.extendMkDerivation {
name = namePrefix + attrs.name or "${finalAttrs.pname}-${finalAttrs.version}";
runtimeDepsCheckHook =
if isBootstrapPackage then
pythonRuntimeDepsCheckHook.override {
inherit (python.pythonOnBuildForHost.pkgs.bootstrap) packaging;
}
else
pythonRuntimeDepsCheckHook;
if isBootstrapPackage then bootstrappedRuntimeDepsCheckHook else pythonRuntimeDepsCheckHook;
in
{
inherit name;
@@ -327,15 +331,7 @@ lib.extendMkDerivation {
setuptoolsBuildHook
]
++ optionals (format' == "pyproject") [
(
if isBootstrapPackage then
pypaBuildHook.override {
inherit (python.pythonOnBuildForHost.pkgs.bootstrap) build;
wheel = null;
}
else
pypaBuildHook
)
(if isBootstrapPackage then bootstrappedPypaBuildHook else pypaBuildHook)
runtimeDepsCheckHook
]
++ optionals (format' == "wheel") [
@@ -348,14 +344,7 @@ lib.extendMkDerivation {
eggInstallHook
]
++ optionals (format' != "other") [
(
if isBootstrapInstallPackage then
pypaInstallHook.override {
inherit (python.pythonOnBuildForHost.pkgs.bootstrap) installer;
}
else
pypaInstallHook
)
(if isBootstrapInstallPackage then bootstrappedPypaInstallHook else pypaInstallHook)
]
++ optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
# This is a test, however, it should be ran independent of the checkPhase and checkInputs
pkgs/development/python-modules/beets-filetote/beets2.13.patch
+288
View File
@@ -0,0 +1,288 @@
From 834f253240fa334f8a73b717c86231a9684ddd07 Mon Sep 17 00:00:00 2001
From: Andrew Rogl <arogl1@gmail.com>
Date: Fri, 17 Jul 2026 18:43:23 +1000
Subject: [PATCH 1/3] Fix for issue #350
---
beetsplug/path_utils.py | 7 ++++++-
tests/unit/test_path_utils.py | 31 +++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/beetsplug/path_utils.py b/beetsplug/path_utils.py
index 6fadc55f..bb16dd7e 100644
--- a/beetsplug/path_utils.py
+++ b/beetsplug/path_utils.py
@@ -51,7 +51,12 @@ def discover_artifacts(
"""Walks a directory and returns a list of all non-beets-handled files."""
artifacts: list[Path] = []
- for root, _dirs, files in util.sorted_walk(source_path, ignore=ignore):
+ source_path_for_walk = util.bytestring_path(source_path)
+ ignore_for_walk = [util.bytestring_path(pattern) for pattern in ignore]
+
+ for root, _dirs, files in util.sorted_walk(
+ source_path_for_walk, ignore=ignore_for_walk
+ ):
for filename in files:
full_path_bytes = root + PATH_SEP_BYTES + filename
diff --git a/tests/unit/test_path_utils.py b/tests/unit/test_path_utils.py
index 579794f9..46940044 100644
--- a/tests/unit/test_path_utils.py
+++ b/tests/unit/test_path_utils.py
@@ -39,6 +39,37 @@ def test_is_beets_file_type(self, extension: str, expected: bool) -> None:
types = {"mp3": "MPEG", "flac": "FLAC"}
assert path_utils.is_beets_file_type(extension, types) is expected
+ def test_discover_artifacts_converts_pathlib_source_to_beets_path(
+ self, monkeypatch: pytest.MonkeyPatch
+ ) -> None:
+ """Test that artifact discovery converts pathlib input before calling
+ beets' walk helper, which expects bytes/str paths.
+ """
+ seen_paths: list[object] = []
+
+ def mock_sorted_walk(
+ path: object,
+ ignore: list[object] | None = None,
+ *_args: object,
+ **_kwargs: object,
+ ) -> Iterator[tuple[bytes, list[bytes], list[bytes]]]:
+ seen_paths.append((path, ignore))
+ assert not isinstance(path, Path)
+ assert ignore is not None
+ assert all(not isinstance(item, Path) for item in ignore)
+ yield (b"/music/album", [], [b"cover.jpg"])
+
+ monkeypatch.setattr(path_utils.util, "sorted_walk", mock_sorted_walk)
+
+ path_utils.discover_artifacts(
+ Path("/music/album"),
+ ignore=[],
+ beets_file_types={},
+ )
+
+ assert seen_paths
+ assert not isinstance(seen_paths[0][0], Path)
+
def test_discover_artifacts(self, monkeypatch: pytest.MonkeyPatch) -> None:
"""Test artifact discovery and ignoring of beets-handled files. Mock
`sorted_walk` to control the filesystem structure.
From 3ec73e639b8cd03fcaf55d194e09dfcd30d77de3 Mon Sep 17 00:00:00 2001
From: Andrew Rogl <arogl1@gmail.com>
Date: Fri, 17 Jul 2026 20:52:18 +1000
Subject: [PATCH 2/3] More updates to work with latest beets
---
beetsplug/filetote.py | 25 +++++++++++++++++++++----
beetsplug/filetote_dataclasses.py | 3 ++-
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/beetsplug/filetote.py b/beetsplug/filetote.py
index d70fe7c7..5c6dc607 100644
--- a/beetsplug/filetote.py
+++ b/beetsplug/filetote.py
@@ -485,6 +485,7 @@ def _get_artifact_destination(
mapping: FiletoteMappingModel,
paired: bool = False,
pattern_category: str | None = None,
+ beets_item: Item | None = None,
) -> Path:
"""Returns a destination path an artifact/file should be moved to. The
artifact filename is unique to ensure files aren't overwritten. This also
@@ -513,7 +514,14 @@ def _get_artifact_destination(
)
# Get template functions and evaluate against mapping
- template_functions = DefaultTemplateFunctions().functions()
+ # DefaultTemplateFunctions requires both item and lib
+ if beets_item is None:
+ raise ValueError(
+ "beets_item is required to initialize DefaultTemplateFunctions"
+ )
+ template_functions = DefaultTemplateFunctions(
+ beets_item, self.filetote_config.session.beets_lib
+ ).functions()
artifact_path = Path(
selected_path_template.substitute(mapping_formatted, template_functions)
+ artifact_ext
@@ -614,6 +622,7 @@ def _collect_paired_artifacts(
mapping=self._generate_mapping(beets_item, item_destination_path),
source_path=source_path,
item_dest=item_destination_path,
+ beets_item=beets_item,
)
)
@@ -637,6 +646,7 @@ def _update_multimove_artifacts(
mapping=self._generate_mapping(beets_item, destination),
source_path=artifact_collection.source_path,
item_dest=destination,
+ beets_item=beets_item,
)
break
@@ -794,6 +804,7 @@ def _queue_artifacts(
mapping=self._generate_mapping(beets_item, item_destination_path),
source_path=source_path,
item_dest=item_destination_path,
+ beets_item=beets_item,
)
)
@@ -841,6 +852,7 @@ def process_events(self, lib: Library) -> None:
source_path=artifact_collection.source_path,
source_artifacts=artifact_collection.artifacts,
mapping=artifact_collection.mapping,
+ beets_item=artifact_collection.beets_item,
)
# Handle all shared artifacts for each source directory
@@ -852,10 +864,12 @@ def process_events(self, lib: Library) -> None:
if not shared_artifacts.artifacts:
continue
- # Mapping derives from the first Item that found this source path
- album_level_mapping = self._run_state.process_queue[
+ # Get mapping and item from the first collection
+ album_level_collection = self._run_state.process_queue[
shared_artifacts.mapping_index
- ].mapping
+ ]
+ album_level_mapping = album_level_collection.mapping
+ album_level_item = album_level_collection.beets_item
artifacts_to_process = [
FiletoteArtifact(path=shared_artifact, paired=False)
@@ -866,6 +880,7 @@ def process_events(self, lib: Library) -> None:
source_path=source_path,
source_artifacts=artifacts_to_process,
mapping=album_level_mapping,
+ beets_item=album_level_item,
)
def _should_process_artifact(
@@ -932,6 +947,7 @@ def process_artifacts(
source_path: Path,
source_artifacts: list[FiletoteArtifact],
mapping: FiletoteMappingModel,
+ beets_item: Item | None = None,
) -> None:
"""Processes and prepares extra files and artifacts for subsequent
manipulation.
@@ -974,6 +990,7 @@ def process_artifacts(
mapping,
artifact.paired,
pattern_category,
+ beets_item,
)
if artifact_source == artifact_dest:
diff --git a/beetsplug/filetote_dataclasses.py b/beetsplug/filetote_dataclasses.py
index 80648f95..c7d36b30 100644
--- a/beetsplug/filetote_dataclasses.py
+++ b/beetsplug/filetote_dataclasses.py
@@ -17,7 +17,7 @@
from collections.abc import Callable
from pathlib import Path
- from beets.library import Library
+ from beets.library import Item, Library
from beets.util import MoveOperation
from .mapping_model import FiletoteMappingModel
@@ -46,6 +46,7 @@ class FiletoteArtifactCollection:
mapping: FiletoteMappingModel
source_path: Path
item_dest: Path
+ beets_item: Item | None = None
@dataclass
From c9617c91c56bb5e3640c3a08ac11fdd79b0a0f7c Mon Sep 17 00:00:00 2001
From: Andrew Rogl <arogl1@gmail.com>
Date: Sat, 18 Jul 2026 09:45:51 +1000
Subject: [PATCH 3/3] All local tests passing, but not elegant solution
---
beetsplug/path_utils.py | 2 +-
tests/pytest_beets_plugin/plugin_fixture.py | 22 +++++++++++++++++----
tests/pytest_beets_plugin/utils.py | 7 ++++++-
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/beetsplug/path_utils.py b/beetsplug/path_utils.py
index bb16dd7e..88efe35b 100644
--- a/beetsplug/path_utils.py
+++ b/beetsplug/path_utils.py
@@ -155,7 +155,7 @@ def is_multidisc(path_name: Path) -> bool:
"""Checks if a directory name matches the multi-disc pattern by replicating the
beets importer's pattern matching for disc folders.
"""
- path_name_bytes = util.bytestring_path(path_name.name)
+ path_name_bytes = util.displayable_path(path_name.name)
return any(pat.match(path_name_bytes) for pat in MULTIDISC_PATTERNS)
diff --git a/tests/pytest_beets_plugin/plugin_fixture.py b/tests/pytest_beets_plugin/plugin_fixture.py
index 04d541b9..44665f7a 100644
--- a/tests/pytest_beets_plugin/plugin_fixture.py
+++ b/tests/pytest_beets_plugin/plugin_fixture.py
@@ -10,6 +10,7 @@
from beets import config, library, plugins, util
from beets.importer import ImportSession
+from beets.ui.commands.modify import ModifyOperation
from mediafile import MediaFile
from ._item_model import MediaMeta
@@ -450,13 +451,26 @@ def _run_cli_modify( # noqa: PLR0913
album: str | None = None,
) -> None:
"""Run the `modify` CLI command."""
- mods = mods or {}
- dels = dels or {}
+ if mods:
+ wrapped_mods = {
+ field: ModifyOperation(operator=None, value=val)
+ for field, val in mods.items()
+ }
+ else:
+ wrapped_mods = {}
+
+ if dels:
+ wrapped_dels = {
+ field: ModifyOperation(operator=None, value=val)
+ for field, val in dels.items()
+ }
+ else:
+ wrapped_dels = {}
modify_items(
lib=self.lib,
- mods=mods,
- dels=dels,
+ mods=wrapped_mods,
+ dels=wrapped_dels,
query=query,
write=write,
move=move,
diff --git a/tests/pytest_beets_plugin/utils.py b/tests/pytest_beets_plugin/utils.py
index 476ca033..5182d7e4 100644
--- a/tests/pytest_beets_plugin/utils.py
+++ b/tests/pytest_beets_plugin/utils.py
@@ -53,7 +53,12 @@ def list_files(self, startpath: Path) -> None:
log.debug("{} does not exist", startpath)
return
- for root, _dirs, files in util.sorted_walk(startpath):
+ source_path_for_walk = util.bytestring_path(startpath)
+ ignore_for_walk = [util.bytestring_path("")]
+
+ for root, _dirs, files in util.sorted_walk(
+ source_path_for_walk, ignore_for_walk
+ ):
root_path = Path(util.displayable_path(root))
try:
pkgs/development/python-modules/beets-filetote/default.nix
+22 -8
View File
@@ -1,6 +1,7 @@
{
lib,
fetchFromGitHub,
fetchpatch,
buildPythonPackage,
# build-system
@@ -31,6 +32,27 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-ZrF9Z3Eaem8ZzNJgQoW45MvsNOCoLsd7l/yLQ2pldR0=";
};
patches = [
# Fixes a few test failures needed since beets 2.12, see:
# https://github.com/gtronset/beets-filetote/issues/328
# https://github.com/gtronset/beets-filetote/pull/336
(fetchpatch {
url = "https://github.com/gtronset/beets-filetote/commit/2684482ebe0cd486512b07621e3904de7faf7dc8.patch";
# Cause merge conflicts
excludes = [
# The changes here mainly include ci related changes, and hence can be
# disabled.
"pyproject.toml"
"CHANGELOG.md"
];
hash = "sha256-zVVJY4+f8A+GBxiHZL8OzLWUUmX9uY25tUoLCkzEHh8=";
})
# Fixes test errors with beets 2.13. Upstream PR is
# https://github.com/gtronset/beets-filetote/pull/351 . It is not merged and not even
# commented by upstream, so we vendor it instead.
./beets2.13.patch
];
# https://github.com/gtronset/beets-filetote/issues/328
postPatch = ''
substituteInPlace pyproject.toml --replace-fail "uv_build>=0.11.21,<0.12" "uv-build"
@@ -58,14 +80,6 @@ buildPythonPackage (finalAttrs: {
writableTmpDirAsHomeHook
];
disabledTestPaths = [
# Tests fail for Beets 2.12.x, see:
# https://github.com/gtronset/beets-filetote/issues/328
"tests/test_exclude.py::TestExclude::test_exclude_strseq_of_filenames_by_string"
"tests/test_exclude.py::TestExclude::test_exclude_strseq_of_filenames_by_list"
"tests/test_printignored.py::TestPrintIgnored::test_print_ignored"
];
meta = {
description = "Beets plugin to move non-music files during the import process";
homepage = "https://github.com/gtronset/beets-filetote";

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