Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-02-09 00:25:54 +00:00
committed by GitHub
134 changed files with 2097 additions and 1531 deletions
+4
View File
@@ -55,6 +55,10 @@
adding `pkg-config`, `xfce4-dev-tools`, and `wrapGAppsHook3` to your `nativeBuildInputs` and
`--enable-maintainer-mode` to your `configureFlags`.
- `albert` has been updated to the version 34.0.5. This release redesigns the query system to support stateful asynchronous handlers and infinite scrolling, and adds internationalized tokenization.
This update introduces several breaking changes: the Python plugin interface is now v5.0, the `PATH` plugin has been renamed to `Commandline`, and the QStylesheets-based widgets box model frontend has been removed.
For more information read the [changelog for 34.0.0](https://albertlauncher.github.io/2026/01/19/albert-v34.0.0-released/).
- `cargo-codspeed` has been updated from `3.0.5` to `4.2.0`. Version `4.0.0` includes breaking changes. For more information read the [changelog for 4.0.0](https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v4.0.0).
- `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js.
+5
View File
@@ -28037,6 +28037,11 @@
githubId = 13259982;
name = "Vanessa McHale";
};
vmfunc = {
github = "vmfunc";
githubId = 59031302;
name = "vmfunc";
};
vncsb = {
email = "viniciusbernardino1@hotmail.com";
github = "vncsb";
@@ -24,6 +24,7 @@ let
// lib.optionalAttrs (i.matchSetting != null) {
match_setting = i.matchSetting;
}
// lib.optionalAttrs (i.trim != null) { trim = i.trim; }
) cfg.ensureProfiles.secrets.entries;
};
nmFileSecretAgentConfigFile = toml.generate "config.toml" nmFileSecretAgentConfig;
@@ -108,6 +109,11 @@ in
description = "file from which the secret value is read";
type = lib.types.str;
};
trim = lib.mkOption {
description = "whether leading and trailing whitespace should be stripped from the files content before being passed to NetworkManager";
type = lib.types.nullOr lib.types.bool;
default = null;
};
};
}
);
@@ -959,13 +959,13 @@
"vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
},
"newrelic_newrelic": {
"hash": "sha256-SfUTt9Ag6pBC9a8rJERBCbccKgJYdNiI1UXoptZoYdw=",
"hash": "sha256-R9xV26gr+jJnNm8hLl6xMdjSEm/U45Ph+IBAB8S4t5A=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.78.0",
"rev": "v3.79.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-RyGnUzRkIR0XoEPc/cc+40QACAJhvOMENzJc1T0Yz40="
"vendorHash": "sha256-fh0QEWSwdoWKED/39OBT5kMADbsUDvhJUYMfWR9P5os="
},
"ns1-terraform_ns1": {
"hash": "sha256-pKdybFzTuuD6D76Uhuz+fLN+EmpDxUwjIWXYK6DRKOY=",
@@ -1031,13 +1031,13 @@
"vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
},
"opentelekomcloud_opentelekomcloud": {
"hash": "sha256-Pco5/kiFOyqwjktDFgHgCtq/kVKshzZyp9cjT+mJYJs=",
"hash": "sha256-14JxQBGvqU6K8PxkZFK7rEetCjN5lKLGXwAOnHSaZ2E=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.36.57",
"rev": "v1.36.58",
"spdx": "MPL-2.0",
"vendorHash": "sha256-v7t3W7v38xw7M8r9rdx+9cTUT6FFY4x5ujkVYD7qThw="
"vendorHash": "sha256-gUilhKLjGR1P4JkQ6zkBJQUvrUcVSJlO1yzJdu3hBFA="
},
"opsgenie_opsgenie": {
"hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
@@ -1,8 +1,11 @@
# shellcheck shell=bash
addLinkDLLPaths() {
addToSearchPath "LINK_DLL_FOLDERS" "$1/lib"
addToSearchPath "LINK_DLL_FOLDERS" "$1/bin"
addToSearchPath "LINK_DLL_FOLDERS" "$1/lib"
addToSearchPath "LINK_DLL_FOLDERS" "$1/bin"
}
# shellcheck disable=SC2154
addEnvHooks "$targetOffset" addLinkDLLPaths
addOutputDLLPaths() {
@@ -15,36 +18,37 @@ addOutputDLLPaths() {
postInstallHooks+=(addOutputDLLPaths)
_dllDeps() {
"$OBJDUMP" -p "$1" \
| sed -n 's/.*DLL Name: \(.*\)/\1/p' \
| sort -u
"$OBJDUMP" -p "$1" \
| sed -n 's/.*DLL Name: \(.*\)/\1/p' \
| sort -u
}
_linkDeps() {
local target="$1" dir="$2" check="$3"
echo 'target:' "$target"
local dll
_dllDeps "$target" | while read dll; do
echo ' dll:' "$dll"
if [[ -e "$dir/$dll" ]]; then continue; fi
# Locate the DLL - it should be an *executable* file on $LINK_DLL_FOLDERS.
local dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")"
if [[ -z "$dllPath" ]]; then
if [[ -z "$check" || -n "${allowedImpureDLLsMap[$dll]}" ]]; then
continue
fi
echo unable to find $dll in $LINK_DLL_FOLDERS >&2
exit 1
fi
echo ' linking to:' "$dllPath"
CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir"
# That DLL might have its own (transitive) dependencies,
# so add also all DLLs from its directory to be sure.
_linkDeps "$dllPath" "$dir" ""
done
local target="$1" dir="$2" check="$3"
echo 'target:' "$target"
local dll
_dllDeps "$target" | while read -r dll; do
echo ' dll:' "$dll"
if [[ -e "$dir/$dll" ]]; then continue; fi
# Locate the DLL - it should be an *executable* file on $LINK_DLL_FOLDERS.
local dllPath
if ! dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")"; then
if [[ -z "$check" || -n "${allowedImpureDLLsMap[$dll]}" ]]; then
continue
fi
echo unable to find "$dll" in "$LINK_DLL_FOLDERS" >&2
exit 1
fi
echo ' linking to:' "$dllPath"
CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir"
# That DLL might have its own (transitive) dependencies,
# so add also all DLLs from its directory to be sure.
_linkDeps "$dllPath" "$dir" ""
done
}
linkDLLs() {
# shellcheck disable=SC2154
if [ ! -d "$prefix" ]; then return; fi
(
set -e
+2 -13
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchfossil,
fetchpatch2,
docutils,
pkg-config,
freetype,
@@ -12,24 +11,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "abcm2ps";
version = "8.14.17";
version = "8.14.18";
src = fetchfossil {
url = "https://chiselapp.com/user/moinejf/repository/abcm2ps";
rev = "v${finalAttrs.version}";
hash = "sha256-YA36wfj7owKu/KyWgCj6U8EJEh831cFtQj4/JtH6kVg=";
hash = "sha256-2nmKjLEZ9dTk+oE16gBm9iheVlLvQFvcdc5FPcxaq6M=";
};
patches = [
# fix build with C23
# 'bool' is a keyword with '-std=c23' onwards
# error: 'bool' cannot be used here
(fetchpatch2 {
url = "https://salsa.debian.org/debian/abcm2ps/-/raw/f741931567bb8cac8c9ed8e73b7ba838e4c17eb3/debian/patches/c23.diff";
hash = "sha256-+2LuHqY5+nWykCYGEOazDeJAf9sggPNp2yiqMQRepfM=";
})
];
configureFlags = [
"--INSTALL=install"
];
+3 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "albert";
version = "33.0.1";
version = "34.0.5";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
tag = "v${finalAttrs.version}";
hash = "sha256-zHLyvFzLR7Ryk6eoD+Lp+w4bIj7MAeREK0YzRXYnx6c=";
hash = "sha256-DwFU3hb63Lf9Etr/I1lQ0SpkHfB1hRI+8V0ILk5a2C0=";
fetchSubmodules = true;
};
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
kdePackages.qcoro
kdePackages.qtkeychain
libqalculate
libarchive
@@ -4,13 +4,13 @@
fetchzip,
}:
stdenvNoCC.mkDerivation rec {
pname = "anonymouspro";
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "anonymous-pro-fonts";
version = "1.002";
src = fetchzip {
url = "https://www.marksimonson.com/assets/content/fonts/AnonymousPro-${
lib.replaceStrings [ "." ] [ "_" ] version
lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
}.zip";
hash = "sha256-FhyzV4By8XKN9EyukAknzml/7lUuV6Evnt6Ht3H6TUU=";
};
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 *.txt -t $out/share/doc/${pname}-${version}
install -Dm644 *.txt -t $out/share/doc/AnonymousPro-${finalAttrs.version}
runHook postInstall
'';
@@ -38,4 +38,4 @@ stdenvNoCC.mkDerivation rec {
license = lib.licenses.ofl;
platforms = lib.platforms.all;
};
}
})
+2 -2
View File
@@ -5,14 +5,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "1.9.11";
version = "1.10.2";
pname = "antidote";
src = fetchFromGitHub {
owner = "mattmc3";
repo = "antidote";
tag = "v${finalAttrs.version}";
hash = "sha256-5vSScLtC8gbHW3rwPZL7ENwwblN7h2QovvWlewlRHAY=";
hash = "sha256-ZgdrVtDtskJeW/hqxkOOln3Ch2ILsYZatJpq/YN1A8o=";
};
dontPatch = true;
+4
View File
@@ -304,6 +304,10 @@ stdenv.mkDerivation (finalAttrs: {
# Failing with "run-test.sh: line 88: 63682 Abort trap: 6"
"arrow-flight-internals-test"
"arrow-flight-sql-test"
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
# https://github.com/apache/arrow/issues/41505
"TestAzuriteGeneric.Empty"
];
in
''
@@ -1,15 +1,20 @@
{
lib,
bign-handheld-thumbnailer,
cargo,
fetchFromGitHub,
glib,
meson,
ninja,
nix-update-script,
pkg-config,
rustPlatform,
rustc,
stdenv,
testers,
}:
rustPlatform.buildRustPackage (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "bign-handheld-thumbnailer";
version = "1.2.0";
@@ -20,14 +25,28 @@ rustPlatform.buildRustPackage (finalAttrs: {
hash = "sha256-+iWf5ybCUHlZz3Ybw3bwLKzlsmiVwep2alVDvL9bG2A=";
};
cargoHash = "sha256-vfTbfg1CAbc//UZtI5trw6znqnNGy6AiCSQNE68vch8=";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-vfTbfg1CAbc//UZtI5trw6znqnNGy6AiCSQNE68vch8=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
cargo
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustc
];
buildInputs = [ glib ];
mesonFlags = [
"-Dupdate_mime_database=false"
];
passthru = {
tests.version = testers.testVersion {
package = bign-handheld-thumbnailer;
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw=";
};
postUnpack = ''
postConfigure = ''
ln -s ${
zig_0_14.fetchDeps {
inherit (finalAttrs)
+4
View File
@@ -35,6 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
++ lib.optionals (withTTS && stdenv.hostPlatform.isLinux) [ speechd-minimal ]
++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
env = lib.optionalAttrs (!stdenv.cc.isClang) {
NIX_CFLAGS_COMPILE = "-std=gnu17";
};
checkFlags =
let
# Most of Blightmud's unit tests pass without trouble in the isolated
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
})
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {
zigBuildFlags = [ "--release=fast" ];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
-79
View File
@@ -1,79 +0,0 @@
{
lib,
fetchFromGitHub,
fetchpatch,
makeWrapper,
clang,
haskellPackages,
}:
haskellPackages.mkDerivation rec {
pname = "carp";
version = "0.5.5";
src = fetchFromGitHub {
owner = "carp-lang";
repo = "Carp";
rev = "v${version}";
sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI=";
};
patches = [
# Compat with GHC 9.2 / Stackage LTS 20, can be dropped at the next release
# https://github.com/carp-lang/Carp/pull/1449
(fetchpatch {
name = "carp-lts-20.patch";
url = "https://github.com/carp-lang/Carp/commit/25f50c92a57cc91b6cb4ec48df658439f936b641.patch";
sha256 = "14yjv0hcvw1qyjmrhksrj6chac3n14d1f1gcaxldfa05llrbfqk0";
})
];
# -Werror breaks build with GHC >= 9.0
# https://github.com/carp-lang/Carp/issues/1386
postPatch = ''
substituteInPlace CarpHask.cabal --replace "-Werror" ""
'';
buildTools = [ makeWrapper ];
executableHaskellDepends = with haskellPackages; [
HUnit
blaze-markup
blaze-html
split
ansi-terminal
cmark
edit-distance
hashable
open-browser
optparse-applicative
];
isExecutable = true;
# The carp executable must know where to find its core libraries and other
# files. Set the environment variable CARP_DIR so that it points to the root
# of the Carp repo. See:
# https://github.com/carp-lang/Carp/blob/master/docs/Install.md#setting-the-carp_dir
#
# Also, clang must be available run-time because carp is compiled to C which
# is then compiled with clang.
postInstall = ''
wrapProgram $out/bin/carp \
--set CARP_DIR $src \
--prefix PATH : ${clang}/bin
wrapProgram $out/bin/carp-header-parse \
--set CARP_DIR $src \
--prefix PATH : ${clang}/bin
'';
description = "Statically typed lisp, without a GC, for real-time applications";
homepage = "https://github.com/carp-lang/Carp";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jluttine ];
# Not actively maintained at the moment
broken = true;
# Windows not (yet) supported.
platforms = with lib.platforms; unix ++ darwin;
}
+3 -3
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cava";
version = "0.10.6";
version = "0.10.7";
src = fetchFromGitHub {
owner = "karlstav";
repo = "cava";
rev = finalAttrs.version;
hash = "sha256-dWPW9vd9LdGALt7Po4nZnW5HkivtZcIUBlXEFurq2os=";
tag = finalAttrs.version;
hash = "sha256-eOGUDGGlja5Cq8XTJFRqyP6qyaoxOJm09vZrlk4KS9k=";
};
buildInputs = [
+2 -2
View File
@@ -7,7 +7,7 @@
}:
let
version = "2.06";
version = "2.08";
in
stdenv.mkDerivation {
pname = "cloc";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
owner = "AlDanial";
repo = "cloc";
rev = "v${version}";
sha256 = "sha256-u/qIkoN8xFA/aggjbSfVHbhUvRo6fWqcJWSMO/Q0hQo=";
sha256 = "sha256-FRby6mhaeTPU0G0rEDszfrTMcrNviFmjbJ8jJnjaZN4=";
};
setSourceRoot = ''
+8 -4
View File
@@ -11,21 +11,25 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "comodoro";
version = "0.0.10";
version = "0.1.2";
src = fetchFromGitHub {
owner = "soywod";
repo = "comodoro";
rev = "v${finalAttrs.version}";
hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18=";
hash = "sha256-FnNNJ6WHR8KCsW+1hPIYddxQlUvpPc+SRbaxAcdVEUk=";
};
cargoHash = "sha256-HzutYDphJdhNJ/jwyA5KVYr6fIutf73rYzKxrzVki9k=";
cargoHash = "sha256-2Drty/dj9HCG86rPt4RgexU83vKMnGFETbOT11Puy/0=";
nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles;
buildNoDefaultFeatures = true;
buildFeatures = lib.optional withTcp "tcp";
buildFeatures = [
"hook-command"
"hook-notify"
]
++ lib.optional withTcp "tcp";
postInstall =
lib.optionalString installManPages ''
+5
View File
@@ -8,6 +8,7 @@
yq,
protobuf,
installShellFiles,
makeBinaryWrapper,
librusty_v8 ? callPackage ./librusty_v8.nix {
inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
},
@@ -67,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
# required by deno_kv crate
protobuf
installShellFiles
makeBinaryWrapper
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ];
@@ -215,6 +217,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
postInstall = ''
# Remove non-essential binaries like denort and test_server
find $out/bin/* -not -name "deno" -delete
# Do what `deno x --install-alias` would do (it doesn't work with Nix-packaged Deno)
makeBinaryWrapper $out/bin/deno $out/bin/dx --add-flags "x"
''
+ lib.optionalString canExecute ''
installShellCompletion --cmd deno \
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "doublecmd";
version = "1.1.32";
version = "1.2.1";
src = fetchFromGitHub {
owner = "doublecmd";
repo = "doublecmd";
tag = "v${finalAttrs.version}";
hash = "sha256-9HhFUzj9cSH49Y5mG4V6BDcr5tlQiBd5OW9xlUWrVmI=";
hash = "sha256-/R13Fwn3019uy+UUtih/CLiXHpFBSKKKKVYdOp29eXs=";
};
nativeBuildInputs = [
@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "Biome (JS/TS/JSON) wrapper plugin";
hash = "sha256-C25GgxvZVRhmjEdoMkDy8mV9wD/Gu9OK7fCs4kQiQdk=";
hash = "sha256-LaByLZ0y+/kqo2+Yfk0WD6/DMUaS9vkkqnTCQwKwujY=";
initConfig = {
configExcludes = [ "**/node_modules" ];
configKey = "biome";
@@ -17,6 +17,6 @@ mkDprintPlugin {
};
pname = "dprint-plugin-biome";
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
url = "https://plugins.dprint.dev/biome-0.11.12.wasm";
version = "0.11.12";
url = "https://plugins.dprint.dev/biome-0.11.13.wasm";
version = "0.11.13";
}
+4 -4
View File
@@ -1,6 +1,6 @@
{
"version": "1.4.3",
"rev": "d1dc88f950d456d72493df452dabdcd13aa413dd",
"hash": "sha256-zYiyY/8mYCyKuSQYNxepGbZPVgdCgULLmhZlWAAW0QA=",
"python_hash": "sha256-qq8y1rdNixQ6oqjKtmIj8IG52gypmP3Qu9ldojPr+Cg="
"version": "1.4.4",
"rev": "6ddac802ffa9bcfbcc3f5f0d71de5dff9b0bc250",
"hash": "sha256-h9Mldv29u47DnFOCN28HBHWz8daFGE/Nj1JcnNhhQ5Q=",
"python_hash": "sha256-860KbaM7Ojp4Qwm5x5WPQg176XKOYayk8pLVaUAuC4M="
}
+3 -3
View File
@@ -27,14 +27,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "eduke32";
version = "0-unstable-2025-10-17";
version = "0-unstable-2026-02-03";
src = fetchFromGitLab {
domain = "voidpoint.io";
owner = "terminx";
repo = "eduke32";
rev = "227c11dee0abaa57bbc22b06f0002e064efa7191";
hash = "sha256-bWty/eOq5dWltNREo9ba68pWDpBxOIfjJK1EtZ27l1U=";
rev = "ba6b7bb1d50d7db820ec03d9bbd66404fab5c543";
hash = "sha256-hD8j2YahEWLNgeATL7ZPwU0ovjwMSmzYdDYgMHKQLTw=";
deepClone = true;
leaveDotGit = true;
postFetch = ''
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "exploitdb";
version = "2026-02-03";
version = "2026-02-05";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
tag = finalAttrs.version;
hash = "sha256-NEav9U7rqPRtDTZPRIP7UTa/cbbRRz5G2YOWZmAabO8=";
hash = "sha256-ec5XB+L/4qRErK/0VOsidkor52aBjuR87ja3V7C3YSw=";
};
nativeBuildInputs = [ makeWrapper ];
-74
View File
@@ -1,74 +0,0 @@
{
lib,
fetchFromGitHub,
perl,
python3,
sqlite,
}:
python3.pkgs.buildPythonApplication rec {
pname = "fabs";
version = "1.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "openafs-contrib";
repo = "fabs";
rev = "v${version}";
hash = "sha256-ejAcCwrOWGX0zsMw224f9GTWlozNYC0gU6LdTk0XqH0=";
};
nativeBuildInputs = [
perl
];
propagatedBuildInputs = with python3.pkgs; [
alembic
python-dateutil
pyyaml
setuptools
sqlalchemy
];
outputs = [
"out"
"man"
];
preBuild = ''
export PREFIX=$out
'';
LOCALSTATEDIR = "/var";
LOCKDIR = "/run/lock/fabs";
preInstall = ''
mkdir -p "$out/etc"
cp -t "$out/etc" -r etc/fabs
'';
# remove once sqlalchemy backend no longer uses deprecated methods
SQLALCHEMY_SILENCE_UBER_WARNING = 1;
nativeCheckInputs = [
python3.pkgs.pytestCheckHook
sqlite
];
meta = {
outputsToInstall = [
"out"
"man"
];
mainProgram = "fabsys";
description = "Flexible AFS Backup System for the OpenAFS distributed file system";
homepage = "https://github.com/openafs-contrib/fabs";
license = with lib.licenses; [ isc ];
maintainers = with lib.maintainers; [ spacefrogg ];
broken = lib.versionAtLeast python3.pkgs.sqlalchemy.version "2.0";
badPlatforms = [
"x86_64-darwin"
"aarch64-darwin"
];
};
}
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
libz
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
tag = "v${finalAttrs.version}";
hash = "sha256-868FK3wr/fjXzrQJ4YVDBvzNuX818lufEx/K0fvJdWo=";
};
postPatch = ''
postConfigure = ''
ln -s ${
callPackage ./build.zig.zon.nix {
zig = zig_0_15;
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "forgejo-mcp";
version = "2.9.0";
version = "2.9.1";
src = fetchFromCodeberg {
owner = "goern";
repo = "forgejo-mcp";
tag = "v${finalAttrs.version}";
hash = "sha256-9H4UQIKRsmKifE9CGvtlkmwMfdsmczUmPckNVJwJqco=";
hash = "sha256-9++EewwF2zxdYCwDdNVX/7liiHZNR1rmM0Z7w5r4v5k=";
};
vendorHash = "sha256-AfQGVq6xeNC+01FdPGqDWvIVXMEp7B6SjAnbswuDdu0=";
vendorHash = "sha256-THdbGlinpH6ZtVveFEN/wy8ITG6pC+Zs6Leyx+2/hqI=";
ldflags = [
"-s"
+2 -2
View File
@@ -49,14 +49,14 @@ let
in
buildGoModule (finalAttrs: {
pname = "forgejo-runner";
version = "12.6.3";
version = "12.6.4";
src = fetchFromGitea {
domain = "code.forgejo.org";
owner = "forgejo";
repo = "runner";
rev = "v${finalAttrs.version}";
hash = "sha256-YBPUxKFHB6eqYyDAFBEbVVTLe5tfHwtLYfR+uCU73hc=";
hash = "sha256-v+b1YGUoIwzSGYUq/aUc5DceKUqWm0LA1Fd1/X/rf5w=";
};
vendorHash = "sha256-MrumzEpSuLVmtrySnlI7Nb7GqxmW8Yk9agsaH4HA6QU=";
+2 -2
View File
@@ -36,13 +36,13 @@ let
in
stdenv.mkDerivation rec {
pname = "freenet";
version = "01504";
version = "01505";
src = fetchFromGitHub {
owner = "hyphanet";
repo = "fred";
tag = "build${version}";
hash = "sha256-a+yRsJ4+gi2UiVeWLsbTgFbzekCSnOJO++9fLVWX0C0=";
hash = "sha256-0ffYQ+8hZqFLjMk6A2rapKZsz/lZNpbG6K0wDqBSdY8=";
};
nativeBuildInputs = [
+10 -10
View File
@@ -59,15 +59,15 @@ builtins.listToAttrs (
{
pname = "G4EMLOW";
version = "8.6.1";
sha256 = "sha256-SpNYjSYIDOHTNrlPdvravkkF+48cuiQVeVAj1s2PSoo=";
version = "8.8";
sha256 = "sha256-tgz9YxdvXRYQfiols1sjUVUDLRc110lnDKUP7eEmJM8=";
envvar = "LE";
}
{
pname = "G4PhotonEvaporation";
version = "6.1";
sha256 = "sha256-X/wfmagdUMkCAYbVmHSvc8U7okwYQrO4KzGIIjuyRvI=";
version = "6.1.2";
sha256 = "sha256-AhScCrkdiO4k54UyVYd345oGi5/N0ZkTYQH/WOY150I=";
envvar = "LEVELGAMMA";
}
@@ -87,8 +87,8 @@ builtins.listToAttrs (
{
pname = "G4PARTICLEXS";
version = "4.1";
sha256 = "sha256-B64eBI6ayOf5H2aWSX3VW9UMzIItl68aC56SMhKm19E=";
version = "4.2";
sha256 = "sha256-xSu/hqqlibeKuoCxarCt8QQeowDeU5WGW5f87m61WFE=";
envvar = "PARTICLEXS";
}
@@ -101,8 +101,8 @@ builtins.listToAttrs (
{
pname = "G4INCL";
version = "1.2";
sha256 = "sha256-+ICxYHPuCpLXSU8ydqbVLU3h02d6DUx8WHADlu0OGn4=";
version = "1.3";
sha256 = "sha256-5LPb5SrO9TU2RU4iRDCRIShDghvSNiju2EbSmVmfO/k=";
envvar = "INCL";
}
@@ -136,8 +136,8 @@ builtins.listToAttrs (
{
pname = "G4CHANNELING";
version = "1.0";
sha256 = "sha256-ID48aZhMoJrNGBodMamw76+tS8EubGCPCwXmlRINZ/I=";
version = "2.0";
sha256 = "sha256-ZiFZKIZE4Ht51/4JHvvrulK1lUaz3G9dKFuXatEvLQY=";
envvar = "CHANNELING";
}
+5 -5
View File
@@ -17,7 +17,7 @@
libxpm,
motif,
python3,
qt5,
qt6,
soxt,
xercesc,
zlib,
@@ -38,12 +38,12 @@ let
in
stdenv.mkDerivation (finalAttrs: {
version = "11.3.2";
version = "11.4.0";
pname = "geant4";
src = fetchurl {
url = "https://cern.ch/geant4-data/releases/geant4-v${finalAttrs.version}.tar.gz";
hash = "sha256-iSrt10JSYqUKw9PHEX2BwMDaS0CMaIDbr1R4uTAeSIw=";
hash = "sha256-rWTJa4s9cSXnRruX9fVXee1ZRoGmpdY8JwJefJzvWPo=";
};
# Fix broken paths in a .pc
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
propagatedNativeBuildInputs = lib.optionals enableQt [ qt5.wrapQtAppsHook ];
propagatedNativeBuildInputs = lib.optionals enableQt [ qt6.wrapQtAppsHook ];
dontWrapQtApps = true; # no binaries
buildInputs =
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
libx11
]
++ lib.optionals enableXM [ motif ]
++ lib.optionals enableQt [ qt5.qtbase ];
++ lib.optionals enableQt [ qt6.qtbase ];
postFixup = ''
substituteInPlace "$out"/bin/geant4.sh \
+1 -7
View File
@@ -11,15 +11,9 @@
packageOverrides ? self: super: { },
}:
let
defaultOverrides = [
(self: super: {
av = self.av_13;
})
];
python = python3.override {
self = python;
packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]);
packageOverrides = lib.composeManyExtensions [ packageOverrides ];
};
version = "0.3.5";
+12 -4
View File
@@ -7,6 +7,7 @@
icu,
ncurses,
nixosTests,
installShellFiles,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -20,6 +21,10 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-Kr7WG8bSuexJiXPARAuLgEt6ctcUQGm1qSCbKtaTooI=";
};
nativeBuildInputs = [
installShellFiles
];
postPatch = ''
patchShebangs gdisk_test.sh
''
@@ -47,15 +52,18 @@ stdenv.mkDerivation (finalAttrs: {
];
installPhase = ''
mkdir -p $out/sbin
mkdir -p $out/share/man/man8
for prog in gdisk sgdisk fixparts cgdisk
do
install -v -m755 $prog $out/sbin
install -v -m644 $prog.8 $out/share/man/man8
installBin $prog
installManPage $prog.8
done
'';
outputs = [
"out"
"man"
];
passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isx86 {
installer-simpleLabels = nixosTests.installer.simpleLabels;
};
+1 -1
View File
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
zig
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+2 -2
View File
@@ -7,11 +7,11 @@
}:
let
pname = "heynote";
version = "2.7.2";
version = "2.8.0";
src = fetchurl {
url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
sha256 = "sha256-MEMZAWmLGdLZxBb/XPEJl8l3RriCfUH4Ogqs4GL0lAw=";
sha256 = "sha256-XZMG7MDNcJqO//PvACczL+ydy729rh860KmtONhrUQE=";
};
appimageContents = appimageTools.extractType2 {
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage (finalAttrs: {
pname = "homebridge";
version = "1.11.1";
version = "1.11.2";
src = fetchFromGitHub {
owner = "homebridge";
repo = "homebridge";
tag = "v${finalAttrs.version}";
hash = "sha256-E21HowCRD78MZW3+um6vN5/NLncF/bt9v/Tw+RYe5xM=";
hash = "sha256-6w2SDnP7P89j3/oLR77D0ubOzDb93krrRJQsDrhPTR4=";
};
npmDepsHash = "sha256-Da64zHwvX0W1viNhy4afr60onlWqbizaVox9Un6c65Y=";
npmDepsHash = "sha256-m6ZLwDyWEwll7PYRHREThj+SvkfCNgODrpo8DTk6j8w=";
# Homebridge's clean phase attempts to install rimraf directly, which fails in nix builds
# rimraf is already in the declared dependencies, so we just don't need to do it.
@@ -16,7 +16,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "infamousPlugins";
pname = "infamousplugins";
version = "0.3.2";
src = fetchFromGitHub {
+5 -4
View File
@@ -1,10 +1,9 @@
{
lib,
fetchpatch,
python3,
fetchFromGitHub,
qt5,
cups,
qt6,
}:
python3.pkgs.buildPythonApplication rec {
@@ -24,7 +23,9 @@ python3.pkgs.buildPythonApplication rec {
--replace-fail ", 'lpr', " ", '${cups}/bin/lpr', "
'';
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
nativeBuildInputs = [ qt6.wrapQtAppsHook ];
buildInputs = [ qt6.qtbase ];
build-system = with python3.pkgs; [ setuptools ];
@@ -37,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
pyserial
pycups
qtconsole
pyqt5
pyqt6
];
# QtApplication.instance() does not work during tests?
+86 -8
View File
@@ -1,7 +1,8 @@
{
lib,
stdenv,
fetchFromGitHub,
flutter332,
flutter338,
corrosion,
rustPlatform,
cargo,
@@ -12,6 +13,9 @@
copyDesktopItems,
makeDesktopItem,
runCommand,
writeText,
pkg-config,
dbus,
}:
let
@@ -23,16 +27,52 @@ let
pname = "intiface-central";
version = "2.6.8-unstable-2025-09-14";
version = "3.0.0";
src = fetchFromGitHub {
owner = "intiface";
repo = "intiface-central";
rev = "17877c623ad7e47fccfbb0acd6d191d672dc5053";
hash = "sha256-sXvV3T/3Po2doDWXxiiJhAbQidwPPTS5300tEbgP83g=";
tag = "v${version}";
hash = "sha256-yKWaXkSjg7LMIKIeRfviu4SmStxl9BSXncJSxXJeU0Y=";
};
rustDep = rustPlatform.buildRustPackage {
inherit pname version src;
sourceRoot = "${src.name}/rust";
preBuild = ''
chmod +w ../..
ln -s ${buttplug} ../../buttplug
'';
cargoHash = "sha256-HpmGmMMocLQ5/DJq8PJ5u04DipSlrReJ/3l76L9j8Yk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
dbus
udev
];
passthru.libraryPath = "lib/librust_lib_intiface_central.so";
};
buttplug_dart = fetchFromGitHub {
owner = "buttplugio";
repo = "buttplug_dart";
tag = "v1.0.0-beta1";
hash = "sha256-cJJU/DRTuQawdfi0aMyi7Vfmv4GtUj7nEBRNYEuZ8JQ=";
};
buttplug = fetchFromGitHub {
owner = "buttplugio";
repo = "buttplug";
tag = "intiface_engine-4.0.0";
hash = "sha256-F3mMQviTeyw9Wlrf8vcbJ9oGTYoKCIpPbj2jayQlpeg=";
};
in
flutter332.buildFlutterApplication {
flutter338.buildFlutterApplication {
inherit pname version src;
patches = [
@@ -41,13 +81,45 @@ flutter332.buildFlutterApplication {
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes.buttplug = "sha256-nm9TdEL9+80hCbaPnpAJTQ0w1t40vWYcxyilQTwvEBU=";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
sourceRoot = "${src.name}/intiface-engine-flutter-bridge";
hash = "sha256-S+TonMTj3xb9oVo17hfjbl448pEvR+3sTTI8ePFjYXk=";
sourceRoot = "${src.name}/rust";
hash = rustDep.cargoHash;
};
cargoRoot = "intiface-engine-flutter-bridge";
cargoRoot = "rust";
customSourceBuilders = {
rust_lib_intiface_central =
{ version, src, ... }:
stdenv.mkDerivation {
pname = "rust_lib_intiface_central";
inherit version src;
inherit (src) passthru;
postPatch =
let
fakeCargokitCmake = writeText "FakeCargokit.cmake" ''
function(apply_cargokit target manifest_dir lib_name any_symbol_name)
set("''${target}_cargokit_lib" ${rustDep}/${rustDep.passthru.libraryPath} PARENT_SCOPE)
endfunction()
'';
in
''
cp ${fakeCargokitCmake} rust_builder/cargokit/cmake/cargokit.cmake
'';
installPhase = ''
runHook preInstall
cp -r . "$out"
runHook postInstall
'';
};
};
preConfigure = ''
export CMAKE_PREFIX_PATH="${corrosion}:$CMAKE_PREFIX_PATH"
@@ -68,6 +140,12 @@ flutter332.buildFlutterApplication {
env.ZLIB_ROOT = zlib-root;
preBuild = ''
chmod +w ..
ln -s ${buttplug_dart} ../buttplug_dart
ln -s ${buttplug} ../buttplug
'';
# without this, only the splash screen will be shown and the logs will contain the
# line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'`
extraWrapProgramArgs = "--chdir $out/app/intiface-central";
File diff suppressed because it is too large Load Diff
+3 -1
View File
@@ -51,6 +51,7 @@ crystal.buildCrystalPackage rec {
# This always uses the latest commit which invalidates the cache even if
# the assets were not changed
assetCommitTemplate = ''{{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit -- assets`.strip}" }}'';
tagTemplate = ''{{ "#{`git tag --points-at HEAD`.strip}" }}'';
inherit (versions.invidious) commit date;
in
@@ -63,7 +64,8 @@ crystal.buildCrystalPackage rec {
--replace-fail ${lib.escapeShellArg branchTemplate} '"master"' \
--replace-fail ${lib.escapeShellArg commitTemplate} '"${commit}"' \
--replace-fail ${lib.escapeShellArg versionTemplate} '"${date}"' \
--replace-fail ${lib.escapeShellArg assetCommitTemplate} '"${commit}"'
--replace-fail ${lib.escapeShellArg assetCommitTemplate} '"${commit}"' \
--replace-fail ${lib.escapeShellArg tagTemplate} '"v${version}"'
# Patch the assets and locales paths to be absolute
substituteInPlace src/invidious.cr \
+5 -5
View File
@@ -1,11 +1,11 @@
{
"invidious": {
"hash": "sha256-tVytYxFcHnGhI5mdZhZk9NBp++8q9PGdYbl8H6j7dAE=",
"version": "2.20250913.0",
"date": "2025.09.13",
"commit": "cf019e3b"
"hash": "sha256-tACx4+HqouftDalZlrurS75gYvS02qnmxQoL91YfTjg=",
"version": "2.20260207.0",
"date": "2026.02.07",
"commit": "118d6356"
},
"videojs": {
"hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4="
}
}
}
+16 -5
View File
@@ -5,6 +5,7 @@
perl,
perlPackages,
makeWrapper,
installShellFiles,
ps,
dnsutils, # dig is recommended for multiple categories
withRecommends ? false, # Install (almost) all recommended tools (see --recommends)
@@ -72,19 +73,29 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-GpXfLLJhM4L9TB8Qw38uaCCwtCmBYg9nrVC001kDckc=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
installShellFiles
makeWrapper
];
buildInputs = [ perl ];
installPhase = ''
mkdir -p $out/bin
cp inxi $out/bin/
runHook preInstall
installBin inxi
wrapProgram $out/bin/inxi \
--set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" \
${prefixPath programs}
mkdir -p $out/share/man/man1
cp inxi.1 $out/share/man/man1/
installManPage inxi.1
runHook postInstall
'';
outputs = [
"out"
"man"
];
meta = {
description = "Full featured CLI system information tool";
longDescription = ''
+5
View File
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [ "PREFIX=$(out)" ];
outputs = [
"out"
"man"
];
meta = {
description = "Disk I/O latency measuring tool";
maintainers = with lib.maintainers; [ raskin ];
+3 -3
View File
@@ -36,13 +36,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "0-unstable-2026-01-31";
version = "0-unstable-2026-02-07";
src = fetchFromGitHub {
owner = "LadybirdBrowser";
repo = "ladybird";
rev = "ea855d2baff7087e86996d1c687427204b453cb5";
hash = "sha256-egLY8z+puxYADFLi5wOPpNCRKhQ35kid0JK7sX5+PTo=";
rev = "ba5c254fdef7d88e1c0dcb74a362da16ffc4a153";
hash = "sha256-Bp+32jd86cScT5PV+hzKXp7WED7OSrpnnzTSb7Etefw=";
};
postPatch = ''
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-OuD5U/T3GuCQrzdhx01NXPSXD7pUAvLnNsznttJogz8=";
};
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "log4cxx";
version = "1.6.0";
version = "1.6.1";
src = fetchurl {
url = "mirror://apache/logging/log4cxx/${finalAttrs.version}/apache-log4cxx-${finalAttrs.version}.tar.gz";
hash = "sha256-R9doxXZcVyHPJ9Ug+H7ycikboPTg0yHHJzXVrshwGKc=";
hash = "sha256-GHyFg29bLyf7Ho13x/Hyk5cl8fZJi3QrDdVpujCWX9I=";
};
postPatch = ''
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-VeB0R/6h9FXSzBfx0IgpGlBz16zQScDSiU7ZvTD/Cds=";
};
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ (lib.optionals x11Support [ libxcb ]);
postPatch = ''
postConfigure = ''
ln -s ${
callPackage ./deps.nix {
inherit zig;
+5 -2
View File
@@ -15,17 +15,18 @@
tcsh,
tk,
fixDarwinDylibNames,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "magic-vlsi";
version = "8.3.597";
version = "8.3.602";
src = fetchFromGitHub {
owner = "RTimothyEdwards";
repo = "magic";
tag = finalAttrs.version;
hash = "sha256-aFT/uTs/nMb8srf0Hjit03qM7+x1yZasIrSv8cjLS88=";
hash = "sha256-jNcuTdBHyVUEvdavIaB2LfMBKhHZkCxFOYyA2kBezqc=";
leaveDotGit = true;
};
@@ -105,6 +106,8 @@ stdenv.mkDerivation (finalAttrs: {
env.NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-implicit-function-declaration";
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
passthru.updateScript = nix-update-script { };
meta = {
description = "VLSI layout tool written in Tcl";
homepage = "http://opencircuitdesign.com/magic/";
+1 -9
View File
@@ -1,14 +1,6 @@
{
python3Packages,
}:
let
pythonPackages = python3Packages.overrideScope (
self: super: {
av = self.av_13;
}
);
in
(pythonPackages.toPythonApplication pythonPackages.manim-slides).overridePythonAttrs (oldAttrs: {
(python3Packages.toPythonApplication python3Packages.manim-slides).overridePythonAttrs (oldAttrs: {
dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.pyqt6-full;
})
+1 -9
View File
@@ -1,12 +1,4 @@
{
python3Packages,
}:
let
pythonPackages = python3Packages.overrideScope (
self: super: {
av = self.av_13;
}
);
in
pythonPackages.toPythonApplication pythonPackages.manim
python3Packages.toPythonApplication python3Packages.manim
@@ -72,17 +72,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-continuwuity";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "continuwuity";
tag = "v${finalAttrs.version}";
hash = "sha256-9gDVhBuWBiXkzOxx0DyJFRV32QFwkKKpORb4I4xtdKw=";
hash = "sha256-E2BJh0ynzUm3gHJXM0qKIgTyEEMD02PG+uPPdr/MKaQ=";
};
cargoHash = "sha256-seJ9zaFMfSm/77n33SJ60/Ux1ovWUbkyi5M8x3kuBhU=";
cargoHash = "sha256-yPQxEZwMQv7HqlQzQxwGrUzZOL21cfNymkNdkOA4GIk=";
nativeBuildInputs = [
pkg-config
+64 -12
View File
@@ -4,23 +4,41 @@
jre,
lib,
makeWrapper,
sourcesJSON ? ./sources.json,
stdenvNoCC,
zlib,
writeScript,
stdenv,
curl,
libxml2,
common-updater-scripts,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
let
suffixMap = {
aarch64-darwin = "native-mac-aarch64";
x86_64-darwin = "native-mac-amd64";
aarch64-linux = "native-linux-aarch64";
x86_64-linux = "native-linux-amd64";
};
suffix =
suffixMap.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
in
stdenvNoCC.mkDerivation rec {
pname = "mill";
version = "1.0.6";
version = "1.1.1";
src =
let
source = (lib.importJSON sourcesJSON)."${stdenvNoCC.hostPlatform.system}";
in
fetchurl {
url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${source.artifact-suffix}/${finalAttrs.version}/mill-dist-${source.artifact-suffix}-${finalAttrs.version}.exe";
inherit (source) hash;
};
src = fetchurl {
url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${suffix}/${version}/mill-dist-${suffix}-${version}.exe";
sha256 =
{
aarch64-darwin = "sha256-ItoUsQ2Hu6aCrVS9GGf/m6DrQyCwJqtvWT8cTJSnZw4=";
x86_64-darwin = "sha256-9NLsUK3H3L27a+OO2kAyApezQpkHAJqvgYgQEXT6y9U=";
aarch64-linux = "sha256-VaBjRHMBKB83dHACQor9R0Gk/7tCpw1ITkxqWJb9+KI=";
x86_64-linux = "sha256-BMc7sGPlTzcED5RjrTNlrBWyr89cNiKfnh3plJ24dZ4=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
buildInputs = [ zlib ];
nativeBuildInputs = [
@@ -47,6 +65,40 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';
passthru.updateScript = writeScript "${pname}-updater" ''
#!${stdenv.shell}
set -eu -o pipefail
PATH=${
lib.makeBinPath [
curl
libxml2 # xmllint
common-updater-scripts
]
}:$PATH
metadataUrl="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/maven-metadata.xml"
latestVersion="$(curl -sS $metadataUrl | xmllint --xpath '/metadata/versioning/release/text()' -)"
${lib.strings.concatStrings (
builtins.map (
platform:
let
suffix = suffixMap.${platform} or (throw "Platform not in suffixMap: ${platform}");
in
''
{
dlUrl="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${suffix}/$latestVersion/mill-dist-${suffix}-$latestVersion.exe"
prefetch="$(nix-prefetch-url $dlUrl)"
hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $prefetch)
update-source-version mill "$latestVersion" "$hash" --system=${platform} --ignore-same-version
}
''
) meta.platforms
)}
'';
meta = {
homepage = "https://com-lihaoyi.github.io/mill/";
license = lib.licenses.mit;
@@ -70,4 +122,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})
}
-18
View File
@@ -1,18 +0,0 @@
{
"aarch64-darwin": {
"artifact-suffix": "native-mac-aarch64",
"hash": "sha256-KMlBQfSytFddA1eNJAx0yiuusgkVe1xkRoHw+03Q9rg="
},
"x86_64-darwin": {
"artifact-suffix": "native-mac-amd64",
"hash": "sha256-8CkXOfhJv/71vTgJqoEQ0TMW+r8kvdH1ff7l/Pbz0ZU="
},
"aarch64-linux": {
"artifact-suffix": "native-linux-aarch64",
"hash": "sha256-d/dSBStPdz4D/Jwe8UuqQRt6FZILwHrKXsSVyO6Ky4c="
},
"x86_64-linux": {
"artifact-suffix": "native-linux-amd64",
"hash": "sha256-iP7KHx+RA+2EQC5tRoBybe7MHXkEbxg00mDqE7IiCoY="
}
}
@@ -0,0 +1 @@
{ python3Packages }: with python3Packages; toPythonApplication mistral-inference
+4 -4
View File
@@ -35,12 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
src =
{
x86_64-linux = fetchurl {
url = "https://web.archive.org/web/20260105022310/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
hash = "sha256-1H5YTzeEQ+JSI2/qRPcuCGkfvI58gufjMks89MqEOB4=";
url = "https://web.archive.org/web/20260203040321/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
hash = "sha256-bIIqDwhajE7+S/Mx7lUn3FC1ZvRbk5mwxYwsmELBlRc=";
};
aarch64-linux = fetchurl {
url = "https://web.archive.org/web/20260105022653/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
hash = "sha256-PL7L0FE3XjFD5l/72CuyTe+yrN/JOy9qvrxNk0B8FKc=";
url = "https://web.archive.org/web/20260203040711/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
hash = "sha256-2WOSwezm/utHaKUktrsWAfoXzCVMz+lfa1wyx0NtXMs=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-gCF+CInczBJfDyZgxEQor5C/OSxKciCu9gbZanaE/nA=";
};
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+4 -4
View File
@@ -21,13 +21,13 @@
# A pure Rust build would lack the Prettier plugin functionality.
stdenv.mkDerivation (finalAttrs: {
pname = "oxfmt";
version = "0.23.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "oxc-project";
repo = "oxc";
tag = "oxfmt_v${finalAttrs.version}";
hash = "sha256-kMCGKbc7qaY0KUOR+67mLvKW4J5CuvYUmC6Aj9xlzSk=";
hash = "sha256-EAM1DxA/TqnIRN5Tlvg5/jvbyOUtSuwQ4RCBeO9esCw=";
};
# Remove patchedDependencies from both workspace and lockfile
@@ -39,14 +39,14 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-cesj9jwWHIFxpFV62QDgYl22EUE8qVjIbb2nRObAyLo=";
hash = "sha256-okwkhcT6mekIvo52T8eSrXUcp/LQhcEYvHyIc5CLdrE=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 2;
hash = "sha256-cPswWCksQ5TyR9M2Maj5mg9I+UltR0WN3U4ClBvwG68=";
hash = "sha256-GOsSTfM93VgGhVlgzXhJIJG9MSf306cEnRru/aTA+oY=";
prePnpmInstall = finalAttrs.postPatch;
};
+1 -1
View File
@@ -13,7 +13,7 @@
let
srcInfo = lib.importJSON ./src-info.json;
description = "Third-party Bilibili client developed in Flutter";
version = "1.1.5.7";
version = "1.1.6";
in
flutter338.buildFlutterApplication {
pname = "piliplus";
+26 -26
View File
@@ -235,11 +235,11 @@
"dependency": "direct dev",
"description": {
"name": "build_runner",
"sha256": "b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072",
"sha256": "ac78098de97893812b7aff1154f29008fa2464cad9e8e7044d39bc905dad4fbc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.10.5"
"version": "2.11.0"
},
"built_collection": {
"dependency": "transitive",
@@ -437,11 +437,11 @@
"dependency": "transitive",
"description": {
"name": "cross_file",
"sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608",
"sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.5+1"
"version": "0.3.5+2"
},
"crypto": {
"dependency": "direct main",
@@ -477,21 +477,21 @@
"dependency": "transitive",
"description": {
"name": "dart_style",
"sha256": "8a0aa2b9bae196552b71575efc94580e447546c26c7120577bb6f81fbd33b52e",
"sha256": "15a7db352c8fc6a4d2bc475ba901c25b39fe7157541da4c16eacce6f8be83e49",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.4"
"version": "3.1.5"
},
"dbus": {
"dependency": "transitive",
"description": {
"name": "dbus",
"sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
"sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.11"
"version": "0.7.12"
},
"device_info_plus": {
"dependency": "direct main",
@@ -806,11 +806,11 @@
"dependency": "transitive",
"description": {
"name": "flutter_inappwebview_internal_annotations",
"sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd",
"sha256": "e30fba942e3debea7b7e6cdd4f0f59ce89dd403a9865193e3221293b6d1544c6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
"version": "1.3.0"
},
"flutter_inappwebview_ios": {
"dependency": "transitive",
@@ -1066,11 +1066,11 @@
"dependency": "transitive",
"description": {
"name": "hooks",
"sha256": "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7",
"sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
"version": "1.0.1"
},
"html": {
"dependency": "direct main",
@@ -1196,11 +1196,11 @@
"dependency": "transitive",
"description": {
"name": "image_picker_ios",
"sha256": "956c16a42c0c708f914021666ffcd8265dde36e673c9fa68c81f7d085d9774ad",
"sha256": "b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.8.13+3"
"version": "0.8.13+6"
},
"image_picker_linux": {
"dependency": "transitive",
@@ -1276,11 +1276,11 @@
"dependency": "direct main",
"description": {
"name": "json_annotation",
"sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
"sha256": "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.9.0"
"version": "4.10.0"
},
"leak_tracker": {
"dependency": "transitive",
@@ -1316,11 +1316,11 @@
"dependency": "transitive",
"description": {
"name": "lints",
"sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
"sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.0"
"version": "6.1.0"
},
"list_counter": {
"dependency": "transitive",
@@ -1553,11 +1553,11 @@
"dependency": "transitive",
"description": {
"name": "objective_c",
"sha256": "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537",
"sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.2.4"
"version": "9.3.0"
},
"octo_image": {
"dependency": "transitive",
@@ -1773,11 +1773,11 @@
"dependency": "direct main",
"description": {
"name": "pretty_qr_code",
"sha256": "2291db3f68d70a3dcd46c6bd599f30991ae4c02f27f36215fbb3f4865a609259",
"sha256": "474f8a4512113fba06f14a6ec9bbf42353b4e651d7a520e3096f2a9b6bbe7a8a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.5.0"
"version": "3.6.0"
},
"protobuf": {
"dependency": "direct main",
@@ -1943,11 +1943,11 @@
"dependency": "transitive",
"description": {
"name": "sentry",
"sha256": "fa14b2177d2cd4489ec78817ec4e52affe1be9f595718de970a5e4ed2bccc530",
"sha256": "80b2a6667db8e0bb148ad70b2af242eb6aa8da9b56b56e72332a4221d93bc01d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.10.0"
"version": "9.12.0"
},
"share_plus": {
"dependency": "direct main",
@@ -2079,11 +2079,11 @@
"dependency": "transitive",
"description": {
"name": "source_span",
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
"sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.1"
"version": "1.10.2"
},
"sqflite": {
"dependency": "transitive",
+4 -4
View File
@@ -1,6 +1,6 @@
{
"rev": "bce73d9f164e8e26930c4461e95485245e8f15e2",
"revCount": 4584,
"commitDate": 1769586366,
"hash": "sha256-qUK7H/jKjVI5TmS/tXRk6KppXIYLC8JG7/ZyJdxpbyo="
"rev": "4ac855d393d7676b02747ee2727c15ad4efc6623",
"revCount": 4626,
"commitDate": 1770453817,
"hash": "sha256-nHqvYy6/Oy/er2fyXaYIfExCAbkXeD4gSBSr1omuIoc="
}
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "primecount";
version = "8.0";
version = "8.2";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primecount";
rev = "v${finalAttrs.version}";
hash = "sha256-EogWQWbAlLlhaIMZck9fzqv9XPJRbSe2zUtKU6xCZvU=";
hash = "sha256-Otf3+Gaq3g0JXnU/G+++eQCBHPOmed3YpUdp1G8ky2Y=";
};
outputs = [
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "primesieve";
version = "12.12";
version = "12.13";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${finalAttrs.version}";
hash = "sha256-6cYQDQ7lbs0zqLAO/aBIGw47idFaz9VVSm3nqGLDTAM=";
hash = "sha256-BO+hhTSF2KdkC8ctwHZQQeI/biF1yEDyR4lCi4QOB/I=";
};
outputs = [
+7 -1
View File
@@ -138,7 +138,13 @@ buildGoModule (finalAttrs: {
'';
preBuild = ''
if [[ -d vendor ]]; then GOARCH= make -o assets plugins; fi
# CC and LD required to fix cross-compilation
# go generate -tags plugins ./plugins
# /nix/store/...-go-1.25.5/share/go/pkg/tool/linux_amd64/link: running riscv64-unknown-linux-gnu-gcc failed: exit status 1
# /nix/store/...-riscv64-unknown-linux-gnu-gcc-wrapper-15.2.0/bin/riscv64-unknown-linux-gnu-gcc -m64 -s -o $WORK/b001/exe/generate -rdynamic /build/go-link-1349994969/go.o
# riscv64-unknown-linux-gnu-gcc: error: unrecognized command-line option '-m64'
# Above log is due to https://github.com/golang/go/blob/b194f5d24a71e34f147c90e4351d80ac75be55de/src/cmd/cgo/gcc.go#L1763
if [[ -d vendor ]]; then GOARCH= CC="$CC_FOR_BUILD" LD="$CC_FOR_BUILD" make -o assets plugins; fi
# Recreate the `make assets-compress` target here - workaround permissions
# errors
-275
View File
@@ -1,275 +0,0 @@
--- a/lib/redmine/scm/adapters/mercurial/redminehelper.py
+++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py
@@ -45,17 +45,20 @@ Output example of rhmanifest::
</repository>
</rhmanifest>
"""
-import re, time, cgi, urllib
+import re, time, html, urllib
from mercurial import cmdutil, commands, node, error, hg, registrar
cmdtable = {}
command = registrar.command(cmdtable) if hasattr(registrar, 'command') else cmdutil.command(cmdtable)
-_x = cgi.escape
-_u = lambda s: cgi.escape(urllib.quote(s))
+_x = lambda s: html.escape(s.decode('utf-8')).encode('utf-8')
+_u = lambda s: html.escape(urllib.parse.quote(s)).encode('utf-8')
+
+def unquoteplus(*args, **kwargs):
+ return urllib.parse.unquote_to_bytes(*args, **kwargs).replace(b'+', b' ')
def _changectx(repo, rev):
- if isinstance(rev, str):
+ if isinstance(rev, bytes):
rev = repo.lookup(rev)
if hasattr(repo, 'changectx'):
return repo.changectx(rev)
@@ -70,10 +73,10 @@ def _tip(ui, repo):
except TypeError: # Mercurial < 1.1
return repo.changelog.count() - 1
tipctx = _changectx(repo, tiprev())
- ui.write('<tip revision="%d" node="%s"/>\n'
+ ui.write(b'<tip revision="%d" node="%s"/>\n'
% (tipctx.rev(), _x(node.hex(tipctx.node()))))
-_SPECIAL_TAGS = ('tip',)
+_SPECIAL_TAGS = (b'tip',)
def _tags(ui, repo):
# see mercurial/commands.py:tags
@@ -84,7 +87,7 @@ def _tags(ui, repo):
r = repo.changelog.rev(n)
except error.LookupError:
continue
- ui.write('<tag revision="%d" node="%s" name="%s"/>\n'
+ ui.write(b'<tag revision="%d" node="%s" name="%s"/>\n'
% (r, _x(node.hex(n)), _u(t)))
def _branches(ui, repo):
@@ -104,136 +107,148 @@ def _branches(ui, repo):
return repo.branchheads(branch)
def lookup(rev, n):
try:
- return repo.lookup(rev)
+ return repo.lookup(str(rev).encode('utf-8'))
except RuntimeError:
return n
for t, n, r in sorted(iterbranches(), key=lambda e: e[2], reverse=True):
if lookup(r, n) in branchheads(t):
- ui.write('<branch revision="%d" node="%s" name="%s"/>\n'
+ ui.write(b'<branch revision="%d" node="%s" name="%s"/>\n'
% (r, _x(node.hex(n)), _u(t)))
def _manifest(ui, repo, path, rev):
ctx = _changectx(repo, rev)
- ui.write('<manifest revision="%d" path="%s">\n'
+ ui.write(b'<manifest revision="%d" path="%s">\n'
% (ctx.rev(), _u(path)))
known = set()
- pathprefix = (path.rstrip('/') + '/').lstrip('/')
+ pathprefix = (path.decode('utf-8').rstrip('/') + '/').lstrip('/')
for f, n in sorted(ctx.manifest().iteritems(), key=lambda e: e[0]):
- if not f.startswith(pathprefix):
+ fstr = f.decode('utf-8')
+ if not fstr.startswith(pathprefix):
continue
- name = re.sub(r'/.*', '/', f[len(pathprefix):])
+ name = re.sub(r'/.*', '/', fstr[len(pathprefix):])
if name in known:
continue
known.add(name)
if name.endswith('/'):
- ui.write('<dir name="%s"/>\n'
+ ui.write(b'<dir name="%s"/>\n'
% _x(urllib.quote(name[:-1])))
else:
fctx = repo.filectx(f, fileid=n)
tm, tzoffset = fctx.date()
- ui.write('<file name="%s" revision="%d" node="%s" '
- 'time="%d" size="%d"/>\n'
+ ui.write(b'<file name="%s" revision="%d" node="%s" '
+ b'time="%d" size="%d"/>\n'
% (_u(name), fctx.rev(), _x(node.hex(fctx.node())),
tm, fctx.size(), ))
- ui.write('</manifest>\n')
+ ui.write(b'</manifest>\n')
-@command('rhannotate',
- [('r', 'rev', '', 'revision'),
- ('u', 'user', None, 'list the author (long with -v)'),
- ('n', 'number', None, 'list the revision number (default)'),
- ('c', 'changeset', None, 'list the changeset'),
+@command(b'rhannotate',
+ [(b'r', b'rev', b'', b'revision'),
+ (b'u', b'user', None, b'list the author (long with -v)'),
+ (b'n', b'number', None, b'list the revision number (default)'),
+ (b'c', b'changeset', None, b'list the changeset'),
],
- 'hg rhannotate [-r REV] [-u] [-n] [-c] FILE...')
+ b'hg rhannotate [-r REV] [-u] [-n] [-c] FILE...')
def rhannotate(ui, repo, *pats, **opts):
- rev = urllib.unquote_plus(opts.pop('rev', None))
+ rev = unquoteplus(opts.pop('rev', b''))
opts['rev'] = rev
- return commands.annotate(ui, repo, *map(urllib.unquote_plus, pats), **opts)
+ return commands.annotate(ui, repo, *map(unquoteplus, pats), **opts)
-@command('rhcat',
- [('r', 'rev', '', 'revision')],
- 'hg rhcat ([-r REV] ...) FILE...')
+@command(b'rhcat',
+ [(b'r', b'rev', b'', b'revision')],
+ b'hg rhcat ([-r REV] ...) FILE...')
def rhcat(ui, repo, file1, *pats, **opts):
- rev = urllib.unquote_plus(opts.pop('rev', None))
+ rev = unquoteplus(opts.pop('rev', b''))
opts['rev'] = rev
- return commands.cat(ui, repo, urllib.unquote_plus(file1), *map(urllib.unquote_plus, pats), **opts)
+ return commands.cat(ui, repo, unquoteplus(file1), *map(unquoteplus, pats), **opts)
-@command('rhdiff',
- [('r', 'rev', [], 'revision'),
- ('c', 'change', '', 'change made by revision')],
- 'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...')
+@command(b'rhdiff',
+ [(b'r', b'rev', [], b'revision'),
+ (b'c', b'change', b'', b'change made by revision')],
+ b'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...')
def rhdiff(ui, repo, *pats, **opts):
"""diff repository (or selected files)"""
change = opts.pop('change', None)
if change: # add -c option for Mercurial<1.1
base = _changectx(repo, change).parents()[0].rev()
- opts['rev'] = [str(base), change]
+ opts['rev'] = [base, change]
opts['nodates'] = True
- return commands.diff(ui, repo, *map(urllib.unquote_plus, pats), **opts)
-
-@command('rhlog',
- [
- ('r', 'rev', [], 'show the specified revision'),
- ('b', 'branch', [],
- 'show changesets within the given named branch'),
- ('l', 'limit', '',
- 'limit number of changes displayed'),
- ('d', 'date', '',
- 'show revisions matching date spec'),
- ('u', 'user', [],
- 'revisions committed by user'),
- ('', 'from', '',
- ''),
- ('', 'to', '',
- ''),
- ('', 'rhbranch', '',
- ''),
- ('', 'template', '',
- 'display with template')],
- 'hg rhlog [OPTION]... [FILE]')
+ return commands.diff(ui, repo, *map(unquoteplus, pats), **opts)
+
+@command(b'rhlog',
+ [
+ (b'r', b'rev', [], b'show the specified revision'),
+ (b'b', b'branch', [],
+ b'show changesets within the given named branch'),
+ (b'l', b'limit', b'',
+ b'limit number of changes displayed'),
+ (b'd', b'date', b'',
+ b'show revisions matching date spec'),
+ (b'u', b'user', [],
+ b'revisions committed by user'),
+ (b'', b'from', b'',
+ b''),
+ (b'', b'to', b'',
+ b''),
+ (b'', b'rhbranch', b'',
+ b''),
+ (b'', b'template', b'',
+ b'display with template')],
+ b'hg rhlog [OPTION]... [FILE]')
+
def rhlog(ui, repo, *pats, **opts):
rev = opts.pop('rev')
bra0 = opts.pop('branch')
- from_rev = urllib.unquote_plus(opts.pop('from', None))
- to_rev = urllib.unquote_plus(opts.pop('to' , None))
- bra = urllib.unquote_plus(opts.pop('rhbranch', None))
- from_rev = from_rev.replace('"', '\\"')
- to_rev = to_rev.replace('"', '\\"')
- if hg.util.version() >= '1.6':
- opts['rev'] = ['"%s":"%s"' % (from_rev, to_rev)]
+ from_rev = unquoteplus(opts.pop('from', b''))
+ to_rev = unquoteplus(opts.pop('to' , b''))
+ bra = unquoteplus(opts.pop('rhbranch', b''))
+ from_rev = from_rev.replace(b'"', b'\\"')
+ to_rev = to_rev.replace(b'"', b'\\"')
+ if (from_rev != b'') or (to_rev != b''):
+ if from_rev != b'':
+ quotefrom = b'"%s"' % (from_rev)
+ else:
+ quotefrom = from_rev
+ if to_rev != b'':
+ quoteto = b'"%s"' % (to_rev)
+ else:
+ quoteto = to_rev
+ opts['rev'] = [b'%s:%s' % (quotefrom, quoteto)]
else:
- opts['rev'] = ['%s:%s' % (from_rev, to_rev)]
- opts['branch'] = [bra]
- return commands.log(ui, repo, *map(urllib.unquote_plus, pats), **opts)
-
-@command('rhmanifest',
- [('r', 'rev', '', 'show the specified revision')],
- 'hg rhmanifest [-r REV] [PATH]')
-def rhmanifest(ui, repo, path='', **opts):
+ opts['rev'] = rev
+ if (bra != b''):
+ opts['branch'] = [bra]
+ return commands.log(ui, repo, *map(unquoteplus, pats), **opts)
+
+
+@command(b'rhmanifest',
+ [(b'r', b'rev', b'', b'show the specified revision')],
+ b'hg rhmanifest -r REV [PATH]')
+def rhmanifest(ui, repo, path=b'', **opts):
"""output the sub-manifest of the specified directory"""
- ui.write('<?xml version="1.0"?>\n')
- ui.write('<rhmanifest>\n')
- ui.write('<repository root="%s">\n' % _u(repo.root))
+ ui.write(b'<?xml version="1.0"?>\n')
+ ui.write(b'<rhmanifest>\n')
+ ui.write(b'<repository root="%s">\n' % _u(repo.root))
try:
- _manifest(ui, repo, urllib.unquote_plus(path), urllib.unquote_plus(opts.get('rev')))
+ _manifest(ui, repo, unquoteplus(path), unquoteplus(opts.get('rev')))
finally:
- ui.write('</repository>\n')
- ui.write('</rhmanifest>\n')
+ ui.write(b'</repository>\n')
+ ui.write(b'</rhmanifest>\n')
-@command('rhsummary',[], 'hg rhsummary')
+@command(b'rhsummary',[], b'hg rhsummary')
def rhsummary(ui, repo, **opts):
"""output the summary of the repository"""
- ui.write('<?xml version="1.0"?>\n')
- ui.write('<rhsummary>\n')
- ui.write('<repository root="%s">\n' % _u(repo.root))
+ ui.write(b'<?xml version="1.0"?>\n')
+ ui.write(b'<rhsummary>\n')
+ ui.write(b'<repository root="%s">\n' % _u(repo.root))
try:
_tip(ui, repo)
_tags(ui, repo)
_branches(ui, repo)
# TODO: bookmarks in core (Mercurial>=1.8)
finally:
- ui.write('</repository>\n')
- ui.write('</rhsummary>\n')
+ ui.write(b'</repository>\n')
+ ui.write(b'</rhsummary>\n')
+26 -20
View File
@@ -1,27 +1,34 @@
source 'https://rubygems.org'
ruby '>= 3.1.0', '< 3.4.0'
ruby '>= 3.2.0', '< 3.5.0'
gem 'rails', '7.2.3'
gem 'rouge', '~> 4.5'
gem 'mini_mime', '~> 1.1.0'
gem "actionpack-xml_parser"
gem 'roadie-rails', '~> 3.2.0'
gem 'roadie-rails', '~> 3.3.0'
gem 'marcel'
gem 'mail', '~> 2.8.1'
gem 'nokogiri', '~> 1.18.3'
gem 'i18n', '~> 1.14.1'
gem 'rbpdf', '~> 1.21.4'
gem 'addressable'
gem 'rubyzip', '~> 2.3.0'
gem 'rubyzip', '~> 2.4.0'
gem 'propshaft', '~> 1.1.0'
gem 'rack', '>= 3.1.3'
gem "stimulus-rails", "~> 1.3"
gem "importmap-rails", "~> 2.0"
gem 'commonmarker', '~> 2.3.0'
gem "doorkeeper", "~> 5.8.2"
gem "bcrypt", require: false
gem "doorkeeper-i18n", "~> 5.2"
gem "requestjs-rails", "~> 0.0.13"
# Ruby Standard Gems
gem 'csv', '~> 3.2.8'
gem 'net-imap', '~> 0.4.20'
gem 'csv', '~> 3.3.2'
gem 'net-imap', '~> 0.5.7'
gem 'net-pop', '~> 0.1.2'
gem 'net-smtp', '~> 0.4.0'
gem 'net-smtp', '~> 0.5.0'
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@@ -41,20 +48,16 @@ end
# Optional gem for exporting the gantt to a PNG file
group :minimagick do
gem 'mini_magick', '~> 5.0.1'
end
# Optional CommonMark support, not for JRuby
group :common_mark do
gem "commonmarker", '~> 0.23.8'
gem 'deckar01-task_list', '2.3.2'
gem 'mini_magick', '~> 5.2.0'
end
# Include database gems for the database adapters NixOS supports
gem 'mysql2', '~> 0.5.0'
gem "with_advisory_lock"
gem 'trilogy', '~> 2.9.0'
gem "with_advisory_lock"
gem 'pg', '~> 1.5.3'
gem 'sqlite3', '~> 1.7.0'
gem 'sqlite3', '~> 2.5.0'
group :development, :test do
gem 'debug'
@@ -64,6 +67,7 @@ group :development do
gem 'listen', '~> 3.3'
gem 'yard', require: false
gem 'svg_sprite', require: false
gem 'bullet'
end
group :test do
@@ -76,13 +80,15 @@ group :test do
gem "capybara", ">= 3.39"
gem 'selenium-webdriver', '>= 4.11.0'
# RuboCop
gem 'rubocop', '~> 1.68.0', require: false
gem 'rubocop-ast', '~> 1.40.0', require: false
gem 'rubocop-performance', '~> 1.22.0', require: false
gem 'rubocop-rails', '~> 2.27.0', require: false
gem 'rubocop', '~> 1.76.0', require: false
gem 'rubocop-performance', '~> 1.25.0', require: false
gem 'rubocop-rails', '~> 2.32.0', require: false
gem 'bundle-audit', require: false
# `bin/rails test` fails at startup with minitest >= 6.0
gem 'minitest', '< 6.0'
# for testing oauth provider capabilities
gem 'oauth2'
gem 'rest-client'
# Lock minitest to 5.x until a Rails release includes support for minitest 6.0
gem 'minitest', '~> 5.27'
end
gem "webrick"
+126 -46
View File
@@ -81,9 +81,13 @@ GEM
public_suffix (>= 2.0.2, < 8.0)
ast (2.4.3)
base64 (0.3.0)
bcrypt (3.1.21)
benchmark (0.5.0)
bigdecimal (4.0.1)
builder (3.3.0)
bullet (8.1.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
bundle-audit (0.2.0)
bundler-audit
bundler-audit (0.9.3)
@@ -100,40 +104,63 @@ GEM
xpath (~> 3.2)
cgi (0.5.1)
chunky_png (1.4.0)
commonmarker (0.23.12)
commonmarker (2.3.2)
rb_sys (~> 0.9)
concurrent-ruby (1.3.6)
connection_pool (3.0.2)
crass (1.0.6)
css_parser (1.21.1)
addressable
csv (3.2.9)
csv (3.3.5)
date (3.5.1)
debug (1.11.1)
irb (~> 1.10)
reline (>= 0.3.8)
deckar01-task_list (2.3.2)
html-pipeline
docile (1.4.1)
domain_name (0.6.20240107)
doorkeeper (5.8.2)
railties (>= 5)
doorkeeper-i18n (5.2.8)
doorkeeper (>= 5.2)
drb (2.2.3)
erb (6.0.1)
erubi (1.13.1)
faraday (2.14.0)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.4.2)
net-http (~> 0.5)
ffi (1.17.3)
globalid (1.3.0)
activesupport (>= 6.1)
hashie (5.1.0)
logger
html-pipeline (2.13.2)
activesupport (>= 2)
nokogiri (>= 1.4)
htmlentities (4.4.2)
http-accept (1.7.0)
http-cookie (1.1.0)
domain_name (~> 0.5)
i18n (1.14.8)
concurrent-ruby (~> 1.0)
importmap-rails (2.2.3)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.8.2)
irb (1.16.0)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.18.0)
json (2.18.1)
jwt (3.1.2)
base64
language_server-protocol (3.17.0.5)
listen (3.9.0)
lint_roller (1.1.0)
listen (3.10.0)
logger
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.7.0)
@@ -147,15 +174,25 @@ GEM
net-smtp
marcel (1.1.0)
matrix (0.4.3)
mini_magick (5.0.1)
mime-types (3.7.0)
logger
mime-types-data (~> 3.2025, >= 3.2025.0507)
mime-types-data (3.2026.0203)
mini_magick (5.2.0)
benchmark
logger
mini_mime (1.1.5)
mini_portile2 (2.8.9)
minitest (5.27.0)
mocha (3.0.1)
ruby2_keywords (>= 0.0.5)
multi_xml (0.8.1)
bigdecimal (>= 3.1, < 5)
mysql2 (0.5.7)
bigdecimal
net-imap (0.4.23)
net-http (0.9.1)
uri (>= 0.11.1)
net-imap (0.5.13)
date
net-protocol
net-ldap (0.17.1)
@@ -163,20 +200,30 @@ GEM
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0.1)
net-smtp (0.5.1)
net-protocol
netrc (0.11.0)
nio4r (2.7.5)
nokogiri (1.18.10)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oauth2 (2.0.18)
faraday (>= 0.17.3, < 4.0)
jwt (>= 1.0, < 4.0)
logger (~> 1.2)
multi_xml (~> 0.5)
rack (>= 1.2, < 4)
snaky_hash (~> 2.0, >= 2.0.3)
version_gem (~> 1.1, >= 1.1.9)
parallel (1.27.0)
parser (3.3.10.0)
parser (3.3.10.1)
ast (~> 2.4.1)
racc
pg (1.5.9)
pp (0.6.3)
prettyprint
prettyprint (0.2.0)
prism (1.9.0)
propshaft (1.1.0)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
@@ -186,7 +233,7 @@ GEM
date
stringio
public_suffix (7.0.2)
puma (7.1.0)
puma (7.2.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.2.4)
@@ -230,26 +277,36 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.3.1)
rake-compiler-dock (1.11.0)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rb_sys (0.9.124)
rake-compiler-dock (= 1.11.0)
rbpdf (1.21.4)
htmlentities
rbpdf-font (~> 1.19.0)
rbpdf-font (1.19.1)
rdoc (7.0.3)
rdoc (7.1.0)
erb
psych (>= 4.0.0)
tsort
regexp_parser (2.11.3)
reline (0.6.3)
io-console (~> 0.5)
requestjs-rails (0.0.14)
railties (>= 7.1.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.4.4)
roadie (5.2.1)
css_parser (~> 1.4)
nokogiri (~> 1.15)
roadie-rails (3.2.0)
railties (>= 5.1, < 8.0)
roadie-rails (3.3.0)
railties (>= 5.1, < 8.1)
roadie (~> 5.0)
rotp (6.3.0)
rouge (4.7.0)
@@ -257,34 +314,38 @@ GEM
chunky_png (~> 1.0)
rqrcode_core (~> 2.0)
rqrcode_core (2.1.0)
rubocop (1.68.0)
rubocop (1.76.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.45.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.40.0)
parser (>= 3.3.1.0)
rubocop-performance (1.22.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.27.0)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.49.0)
parser (>= 3.3.7.2)
prism (~> 1.7)
rubocop-performance (1.25.0)
lint_roller (~> 1.1)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
rubocop-rails (2.32.0)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.44.0, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
rubyzip (2.4.1)
sanitize (6.1.3)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
securerandom (0.4.1)
selenium-webdriver (4.39.0)
selenium-webdriver (4.40.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
@@ -296,8 +357,13 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.2)
simplecov_json_formatter (0.1.4)
sqlite3 (1.7.3)
snaky_hash (2.0.3)
hashie (>= 0.1.0, < 6)
version_gem (>= 1.1.8, < 3)
sqlite3 (2.5.0)
mini_portile2 (~> 2.8.0)
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.2.0)
svg_optimizer (0.3.0)
nokogiri
@@ -307,18 +373,24 @@ GEM
thor
thor (1.5.0)
timeout (0.6.0)
trilogy (2.9.0)
tsort (0.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.2.0)
uniform_notifier (1.18.0)
uri (1.1.1)
useragent (0.16.11)
version_gem (1.1.9)
webrick (1.9.2)
websocket (1.2.11)
websocket-driver (0.8.0)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
with_advisory_lock (7.0.2)
with_advisory_lock (7.5.0)
activerecord (>= 7.2)
zeitwerk (>= 2.7)
xpath (3.2.0)
@@ -332,28 +404,33 @@ PLATFORMS
DEPENDENCIES
actionpack-xml_parser
addressable
bcrypt
bullet
bundle-audit
capybara (>= 3.39)
commonmarker (~> 0.23.8)
csv (~> 3.2.8)
commonmarker (~> 2.3.0)
csv (~> 3.3.2)
debug
deckar01-task_list (= 2.3.2)
doorkeeper (~> 5.8.2)
doorkeeper-i18n (~> 5.2)
ffi
html-pipeline (~> 2.13.2)
i18n (~> 1.14.1)
importmap-rails (~> 2.0)
listen (~> 3.3)
mail (~> 2.8.1)
marcel
mini_magick (~> 5.0.1)
mini_magick (~> 5.2.0)
mini_mime (~> 1.1.0)
minitest (< 6.0)
minitest (~> 5.27)
mocha (>= 2.0.1)
mysql2 (~> 0.5.0)
net-imap (~> 0.4.20)
net-imap (~> 0.5.7)
net-ldap (~> 0.17.0)
net-pop (~> 0.1.2)
net-smtp (~> 0.4.0)
net-smtp (~> 0.5.0)
nokogiri (~> 1.18.3)
oauth2
pg (~> 1.5.3)
propshaft (~> 1.1.0)
puma
@@ -361,20 +438,23 @@ DEPENDENCIES
rails (= 7.2.3)
rails-dom-testing (>= 2.3.0)
rbpdf (~> 1.21.4)
roadie-rails (~> 3.2.0)
requestjs-rails (~> 0.0.13)
rest-client
roadie-rails (~> 3.3.0)
rotp (>= 5.0.0)
rouge (~> 4.5)
rqrcode
rubocop (~> 1.68.0)
rubocop-ast (~> 1.40.0)
rubocop-performance (~> 1.22.0)
rubocop-rails (~> 2.27.0)
rubyzip (~> 2.3.0)
rubocop (~> 1.76.0)
rubocop-performance (~> 1.25.0)
rubocop-rails (~> 2.32.0)
rubyzip (~> 2.4.0)
sanitize (~> 6.0)
selenium-webdriver (>= 4.11.0)
simplecov (~> 0.22.0)
sqlite3 (~> 1.7.0)
sqlite3 (~> 2.5.0)
stimulus-rails (~> 1.3)
svg_sprite
trilogy (~> 2.9.0)
tzinfo-data
webrick
with_advisory_lock
+489 -73
View File
@@ -197,8 +197,8 @@
"tzinfo"
];
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -238,8 +238,8 @@
};
base64 = {
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -250,10 +250,21 @@
};
version = "0.3.0";
};
bcrypt = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1krd99p9828n07rcjjms56jaqv7v6s9pn7y6bppcfhhaflyn2r2r";
type = "gem";
};
version = "3.1.21";
};
benchmark = {
groups = [
"common_mark"
"default"
"development"
"minimagick"
"test"
];
platforms = [ ];
@@ -266,8 +277,8 @@
};
bigdecimal = {
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -288,6 +299,20 @@
};
version = "3.3.0";
};
bullet = {
dependencies = [
"activesupport"
"uniform_notifier"
];
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1zwq7g98c1mdigahb50c980a0fcc4ib1m9ivmgf3f8gc6qk7wjv0";
type = "gem";
};
version = "8.1.0";
};
bundle-audit = {
dependencies = [ "bundler-audit" ];
groups = [ "test" ];
@@ -354,19 +379,20 @@
version = "1.4.0";
};
commonmarker = {
groups = [ "common_mark" ];
dependencies = [ "rb_sys" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1k9wa8fnfz08lyn86vpqhdv4jffznlxcx6p6qr11rdf7qy4jybfs";
sha256 = "04g73hpmrn92jcj1cfblg4aq2k6sijd6i4xa4n0y0p2fbxry715z";
type = "gem";
};
version = "0.23.12";
version = "2.3.2";
};
concurrent-ruby = {
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -379,8 +405,8 @@
};
connection_pool = {
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -417,10 +443,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1fp986v5xfpzcj9v3dyvdd26fcnmbbzjwcp66pz34hv6g86z66a9";
sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
type = "gem";
};
version = "3.2.9";
version = "3.3.5";
};
date = {
groups = [
@@ -453,17 +479,6 @@
};
version = "1.11.1";
};
deckar01-task_list = {
dependencies = [ "html-pipeline" ];
groups = [ "common_mark" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as";
type = "gem";
};
version = "2.3.2";
};
docile = {
groups = [
"default"
@@ -477,10 +492,45 @@
};
version = "1.4.1";
};
domain_name = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz";
type = "gem";
};
version = "0.6.20240107";
};
doorkeeper = {
dependencies = [ "railties" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1lsh9lzrglqlwm9icmn0ggrwjc9iy9308f9m59z1w2srmyp0fgd7";
type = "gem";
};
version = "5.8.2";
};
doorkeeper-i18n = {
dependencies = [ "doorkeeper" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lpmvaglypxlmaiqv4sjrf1b1sc8f589cv7xq3rr4j26vw0lf1g4";
type = "gem";
};
version = "5.2.8";
};
drb = {
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -515,6 +565,38 @@
};
version = "1.13.1";
};
faraday = {
dependencies = [
"faraday-net_http"
"json"
"logger"
];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6";
type = "gem";
};
version = "2.14.0";
};
faraday-net_http = {
dependencies = [ "net-http" ];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi";
type = "gem";
};
version = "3.4.2";
};
ffi = {
groups = [
"default"
@@ -556,15 +638,26 @@
};
version = "1.3.0";
};
hashie = {
dependencies = [ "logger" ];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0w1qrab701d3a63aj2qavwc2fpcqmkzzh1w2x93c88zkjqc4frn2";
type = "gem";
};
version = "5.1.0";
};
html-pipeline = {
dependencies = [
"activesupport"
"nokogiri"
];
groups = [
"common_mark"
"default"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
@@ -583,11 +676,38 @@
};
version = "4.4.2";
};
http-accept = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6";
type = "gem";
};
version = "1.7.0";
};
http-cookie = {
dependencies = [ "domain_name" ];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
type = "gem";
};
version = "1.1.0";
};
i18n = {
dependencies = [ "concurrent-ruby" ];
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -598,6 +718,21 @@
};
version = "1.14.8";
};
importmap-rails = {
dependencies = [
"actionpack"
"activesupport"
"railties"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0smixr7l97pky55k0kz9rxmmyk2032kp7xdqixaz2z699lmbw0bi";
type = "gem";
};
version = "2.2.3";
};
io-console = {
groups = [
"default"
@@ -639,10 +774,24 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di";
sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy";
type = "gem";
};
version = "2.18.0";
version = "2.18.1";
};
jwt = {
dependencies = [ "base64" ];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0dfm4bhl4fzn076igh0bmh2v1vphcrxdv6ldc46hdd3bkbqr2sdg";
type = "gem";
};
version = "3.1.2";
};
language_server-protocol = {
groups = [
@@ -657,8 +806,22 @@
};
version = "3.17.0.5";
};
lint_roller = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c";
type = "gem";
};
version = "1.1.0";
};
listen = {
dependencies = [
"logger"
"rb-fsevent"
"rb-inotify"
];
@@ -666,15 +829,16 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv";
sha256 = "1ln9c0vx165hkfbn2817qw4m6i77xcxh6q0r5v6fqfhlcbdq5qf6";
type = "gem";
};
version = "3.9.0";
version = "3.10.0";
};
logger = {
groups = [
"common_mark"
"default"
"development"
"minimagick"
"test"
];
platforms = [ ];
@@ -738,15 +902,49 @@
};
version = "0.4.3";
};
mime-types = {
dependencies = [
"logger"
"mime-types-data"
];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
type = "gem";
};
version = "3.7.0";
};
mime-types-data = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0bradmf21c9g4z6f3hvqmnf6i2sbgp0630y2j5rq8a7h79lksdal";
type = "gem";
};
version = "3.2026.0203";
};
mini_magick = {
dependencies = [
"benchmark"
"logger"
];
groups = [ "minimagick" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ig7gl9q0qf5c54f9gvg8mqzi15dy6p71q25j80mb4bdnj9v6sz6";
sha256 = "0jiz4jqsrmgnkyvpmsq2vicmvdqa6q2ibzx93lnj8f0xvfzzymr7";
type = "gem";
};
version = "5.0.1";
version = "5.2.0";
};
mini_mime = {
groups = [
@@ -763,7 +961,6 @@
};
mini_portile2 = {
groups = [
"common_mark"
"default"
"development"
"test"
@@ -778,8 +975,8 @@
};
minitest = {
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -801,6 +998,20 @@
};
version = "3.0.1";
};
multi_xml = {
dependencies = [ "bigdecimal" ];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0nnzdswa9l6w8k5ndgbv5al9f0jkg14dqwzyic4fjd5c1cls1nxd";
type = "gem";
};
version = "0.8.1";
};
mysql2 = {
dependencies = [ "bigdecimal" ];
groups = [ "default" ];
@@ -812,6 +1023,20 @@
};
version = "0.5.7";
};
net-http = {
dependencies = [ "uri" ];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5";
type = "gem";
};
version = "0.9.1";
};
net-imap = {
dependencies = [
"date"
@@ -821,10 +1046,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lw9yv95w55k5rb3bdifm6b1g0c2g0a1ly11wwviyyx4829wjv5q";
sha256 = "1c9p0r2z6j14g0vi323r6x4cs6w87xjvphlkxf7x63h2wsscgc7d";
type = "gem";
};
version = "0.4.23";
version = "0.5.13";
};
net-ldap = {
groups = [ "ldap" ];
@@ -864,10 +1089,23 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0csspzqrg7s2v2wdp6vqqs1rra6w5ilpgnps5h52ig6rp7x2i389";
sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd";
type = "gem";
};
version = "0.4.0.1";
version = "0.5.1";
};
netrc = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
type = "gem";
};
version = "0.11.0";
};
nio4r = {
groups = [
@@ -888,7 +1126,6 @@
"racc"
];
groups = [
"common_mark"
"default"
"development"
"test"
@@ -901,6 +1138,25 @@
};
version = "1.18.10";
};
oauth2 = {
dependencies = [
"faraday"
"jwt"
"logger"
"multi_xml"
"rack"
"snaky_hash"
"version_gem"
];
groups = [ "test" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "11rj80dgjz05x5xx93y4bfk9rcn7fl56srj8fgqn7ffzf3j13kxs";
type = "gem";
};
version = "2.0.18";
};
parallel = {
groups = [
"default"
@@ -926,10 +1182,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1mmb59323ldv6vxfmy98azgsla9k3di3fasvpb28hnn5bkx8fdff";
sha256 = "1256ws3w3gnfqj7r3yz2i9y1y7k38fhjphxpybkyb4fds8jsgxh6";
type = "gem";
};
version = "3.3.10.0";
version = "3.3.10.1";
};
pg = {
groups = [ "default" ];
@@ -970,6 +1226,19 @@
};
version = "0.2.0";
};
prism = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
type = "gem";
};
version = "1.9.0";
};
propshaft = {
dependencies = [
"actionpack"
@@ -1023,14 +1292,13 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74";
sha256 = "1a3jd9qakasizrf7dkq5mqv51fjf02r2chybai2nskjaa6mz93mz";
type = "gem";
};
version = "7.1.0";
version = "7.2.0";
};
racc = {
groups = [
"common_mark"
"default"
"development"
"test"
@@ -1192,6 +1460,16 @@
};
version = "13.3.1";
};
rake-compiler-dock = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hpq52ab86s70yv5hk56f0z14izhh59af95nlv73bsrksln1zdga";
type = "gem";
};
version = "1.11.0";
};
rb-fsevent = {
groups = [
"default"
@@ -1219,6 +1497,17 @@
};
version = "0.11.1";
};
rb_sys = {
dependencies = [ "rake-compiler-dock" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rvshyirm32lzf2sggcrhvz5hi828s3rznmkchvzgshjgdapcd2i";
type = "gem";
};
version = "0.9.124";
};
rbpdf = {
dependencies = [
"htmlentities"
@@ -1257,10 +1546,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1yc1xa3wckwwan518qii22jagqzlr5bypflx3nkvpdqr3ncd1qyz";
sha256 = "0qvky4s2fx5xbaz1brxanalqbcky3c7xbqd6dicpih860zgrjj29";
type = "gem";
};
version = "7.0.3";
version = "7.1.0";
};
regexp_parser = {
groups = [
@@ -1290,6 +1579,33 @@
};
version = "0.6.3";
};
requestjs-rails = {
dependencies = [ "railties" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0bcswqkc3n90brf4ir3xdk8wfhq19ics7zzfmlvg36rvk6c42jdv";
type = "gem";
};
version = "0.0.14";
};
rest-client = {
dependencies = [
"http-accept"
"http-cookie"
"mime-types"
"netrc"
];
groups = [ "test" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im";
type = "gem";
};
version = "2.1.0";
};
rexml = {
groups = [
"default"
@@ -1326,10 +1642,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gs3axi7nsmsh3y7ix1n9wn4ccsxgv2dpgwy9yzgvsfggy2k99ch";
sha256 = "0phadjq9xyx91535y2xn09jywhgzj8ljpm3yywyznqjrcdxgd020";
type = "gem";
};
version = "3.2.0";
version = "3.3.0";
};
rotp = {
groups = [ "default" ];
@@ -1379,6 +1695,7 @@
dependencies = [
"json"
"language_server-protocol"
"lint_roller"
"parallel"
"parser"
"rainbow"
@@ -1391,24 +1708,31 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ay1lrz3ffrznjfr65c6xvkinb6m4l7h68cd9qbrf7nq0j2m1pq7";
sha256 = "0csnyhcjrxjiiz849rc8rjdqg9w5ixwi2wcj7ii3vghbp9rg2i5f";
type = "gem";
};
version = "1.68.0";
version = "1.76.2";
};
rubocop-ast = {
dependencies = [ "parser" ];
groups = [ "test" ];
dependencies = [
"parser"
"prism"
];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rdjvc8jz05svc017akwsf2n91bmyj016m5qsg2dyz2i115hxyhp";
sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9";
type = "gem";
};
version = "1.40.0";
version = "1.49.0";
};
rubocop-performance = {
dependencies = [
"lint_roller"
"rubocop"
"rubocop-ast"
];
@@ -1416,14 +1740,15 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0yd616imfjvlpwsk7lw5kq9h4iz6qkmf10xlaib6b47fy5x77ncy";
sha256 = "1h9flnqk2f3llwf8g0mk0fvzzznfj7hsil3qg88m803pi9b06zbg";
type = "gem";
};
version = "1.22.1";
version = "1.25.0";
};
rubocop-rails = {
dependencies = [
"activesupport"
"lint_roller"
"rack"
"rubocop"
"rubocop-ast"
@@ -1432,10 +1757,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1zplyab5n8gh7zzbwrrxrkzb2406afrjm6a3a3zdx72k17swx9n3";
sha256 = "1404nfa0gw3p0xzmv4b9zg9v1da0nwc4m7796pl73zi2hwy65k4z";
type = "gem";
};
version = "2.27.0";
version = "2.32.0";
};
ruby-progressbar = {
groups = [
@@ -1471,10 +1796,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
type = "gem";
};
version = "2.3.2";
version = "2.4.1";
};
sanitize = {
dependencies = [
@@ -1492,8 +1817,8 @@
};
securerandom = {
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -1516,10 +1841,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09m8gd0wafvvrrk7mh6rxskfx9rghbqwdhxshvrflwllsdiiwjlq";
sha256 = "0nsys7ghl99zn2n4zjw3bi697qqnm6pmmi7aaafln79whnlpmvqn";
type = "gem";
};
version = "4.39.0";
version = "4.40.0";
};
simplecov = {
dependencies = [
@@ -1562,16 +1887,44 @@
};
version = "0.1.4";
};
snaky_hash = {
dependencies = [
"hashie"
"version_gem"
];
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0mnllrwhs7psw6xxs8x5yx85k12qjfdgs8zs0bxm70bfascx58r5";
type = "gem";
};
version = "2.0.3";
};
sqlite3 = {
dependencies = [ "mini_portile2" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs";
sha256 = "0sqshkafxa1r34yj4yxisd4kddmjq9jrhx6azqy3z71nwqv01yl7";
type = "gem";
};
version = "1.7.3";
version = "2.5.0";
};
stimulus-rails = {
dependencies = [ "railties" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01nbcxyi1mhikq8yjl0g9swy1cpzx146pli6w16gcfpkl7zpcmkn";
type = "gem";
};
version = "1.3.4";
};
stringio = {
groups = [
@@ -1640,6 +1993,16 @@
};
version = "0.6.0";
};
trilogy = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0zq6yrp1074yd5lflz7yqzpicpcg4bxrl7sxw5c4g2m67dk3pmm2";
type = "gem";
};
version = "2.9.0";
};
tsort = {
groups = [
"default"
@@ -1657,8 +2020,8 @@
tzinfo = {
dependencies = [ "concurrent-ruby" ];
groups = [
"common_mark"
"default"
"development"
"test"
];
platforms = [ ];
@@ -1670,6 +2033,7 @@
version = "2.0.6";
};
unicode-display_width = {
dependencies = [ "unicode-emoji" ];
groups = [
"default"
"test"
@@ -1677,10 +2041,49 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
sha256 = "0hiwhnqpq271xqari6mg996fgjps42sffm9cpk6ljn8sd2srdp8c";
type = "gem";
};
version = "2.6.0";
version = "3.2.0";
};
unicode-emoji = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "03zqn207zypycbz5m9mn7ym763wgpk7hcqbkpx02wrbm1wank7ji";
type = "gem";
};
version = "4.2.0";
};
uniform_notifier = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "17ffzyq6482yn27r7rz2k3zslf9jigbz383d90c68vznarapi1s7";
type = "gem";
};
version = "1.18.0";
};
uri = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
type = "gem";
};
version = "1.1.1";
};
useragent = {
groups = [ "default" ];
@@ -1692,6 +2095,19 @@
};
version = "0.16.11";
};
version_gem = {
groups = [
"default"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "195r5qylwxwqbllnpli9c2pzin0lky6h3fw912h88g2lmri0j6hc";
type = "gem";
};
version = "1.1.9";
};
webrick = {
groups = [ "default" ];
platforms = [ ];
@@ -1748,10 +2164,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "001sswk3d1n8nf4pzxxc4rvxw47q05m0harl50ys25b18nxqai6z";
sha256 = "1gqm78w1va32w6kbhpm86pvn9g28d2g7d9j9jrxys42sscg2znys";
type = "gem";
};
version = "7.0.2";
version = "7.5.0";
};
xpath = {
dependencies = [ "nokogiri" ];
+40 -6
View File
@@ -1,4 +1,5 @@
{
defaultGemConfig,
lib,
stdenvNoCC,
fetchurl,
@@ -6,10 +7,15 @@
ruby_3_3,
makeWrapper,
nixosTests,
openssl,
rustc,
cargo,
rustPlatform,
buildRubyGem,
}:
let
version = "6.0.8";
version = "6.1.1";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -23,6 +29,38 @@ let
"minimagick"
"test"
];
gemConfig = defaultGemConfig // {
trilogy = attrs: {
buildInputs = [ openssl ];
};
commonmarker = attrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (buildRubyGem { inherit (attrs) gemName version source; })
name
src
unpackPhase
nativeBuildInputs
;
hash = "sha256-rUNsf7DUVueD9revOR6Mab36XnVEmjL4bVv6TIMMqjM=";
};
dontBuild = false;
nativeBuildInputs = [
cargo
rustc
rustPlatform.cargoSetupHook
rustPlatform.bindgenHook
];
disallowedReferences = [
rustc.unwrapped
];
preInstall = ''
export CARGO_HOME="$PWD/../.cargo/"
'';
postInstall = ''
find $out -type f -name .rustc_info.json -delete
'';
};
};
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -31,7 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://www.redmine.org/releases/redmine-${finalAttrs.version}.tar.gz";
hash = "sha256-5DCIUq/2Yylqn3fTEwL00BjgQwXtAwq9R5gtXdoDzEY=";
hash = "sha256-Hy5t0GlwYvxzNwH4i1BB3A38a1NiVet5AvIfsJcOYD4=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -41,10 +79,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
rubyEnv.bundler
];
# taken from https://www.redmine.org/issues/33784
# can be dropped when the upstream bug is closed and the fix is present in the upstream release
patches = [ ./0001-python3.patch ];
buildPhase = ''
mv config config.dist
mv themes themes.dist
+2 -2
View File
@@ -21,7 +21,7 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "refine";
version = "0.6.3";
version = "0.7.0";
pyproject = false; # uses meson
src = fetchFromGitLab {
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
owner = "TheEvilSkeleton";
repo = "Refine";
tag = finalAttrs.version;
hash = "sha256-0FxnohwqAu7UW1e0kBNk8rFv2q736qlmFFhce2BNLdQ=";
hash = "sha256-5rHct0GXsdjeG+wXxtDKXWBTCphhOCojuR2ExXrZyWA=";
};
nativeBuildInputs = [
@@ -59,8 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional xwaylandSupport libx11;
dontConfigure = true;
zigBuildFlags = [
"--system"
"${finalAttrs.deps}"
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
zig
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rsop";
version = "0.9.3";
version = "0.10.0";
src = fetchFromCodeberg {
owner = "heiko";
repo = "rsop";
rev = "rsop/v${finalAttrs.version}";
hash = "sha256-eP3jh5TIhMHDWnttnYvBre/tfzxajLNGtInWNiFAPiw=";
hash = "sha256-UEXSYfbbnEV0GL0Q6wFNoERWp3jjEZ2ia/UhOGo1dn8=";
};
cargoHash = "sha256-vmxqpOABd7S/htX8bbThyvfOSBY9f1CjX0gY9NQVHss=";
cargoHash = "sha256-Sa9ZRUsTLXLYQJYmGhkMqnWTHey5shy/w0l90xa+ck8=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ser2net";
version = "4.6.6";
version = "4.6.7";
src = fetchFromGitHub {
owner = "cminyard";
repo = "ser2net";
rev = "v${finalAttrs.version}";
hash = "sha256-TL6btl8Q8hpIBfzHdJ+TLdF+r9zQRLytzVx810R7yYI=";
hash = "sha256-Axo3qa+QoBqFOLkxA6ZnEYu0M1p9LSM9h/oS8JsdwOY=";
};
passthru = {
+8 -9
View File
@@ -2,13 +2,11 @@
lib,
stdenv,
fetchFromGitLab,
autoconf,
gfortran,
cmake,
gfortran,
libzip,
pkg-config,
lhapdf,
autoPatchelfHook,
patchelf,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -27,19 +25,20 @@ stdenv.mkDerivation (finalAttrs: {
'';
nativeBuildInputs = [
autoconf
gfortran
cmake
pkg-config
gfortran
]
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
++ lib.optionals stdenv.hostPlatform.isLinux [ patchelf ];
buildInputs = [
libzip
lhapdf
];
enableParallelBuilding = true;
cmakeFlags = [
# Needed to initialize a valid SHERPA_LIBRARY_PATH
"-DCMAKE_INSTALL_LIBDIR=lib"
];
preFixup =
lib.optionalString stdenv.hostPlatform.isDarwin ''
+42
View File
@@ -0,0 +1,42 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule {
pname = "sif";
version = "0-unstable-2026-01-11";
src = fetchFromGitHub {
owner = "vmfunc";
repo = "sif";
tag = "automated-release-c988e54";
hash = "sha256-/9LRmSrji/8SCD9aHx82HwBfBRPVKzOnogw+uvDI+WI=";
};
vendorHash = "sha256-ztKXnOjZS/jMxsRjtF0rIZ3lKv4YjMdZd6oQFRuAtR4=";
subPackages = [ "cmd/sif" ];
env.CGO_ENABLED = 0;
ldflags = [
"-s"
"-w"
];
# network-dependent tests
doCheck = false;
passthru.updateScript = nix-update-script { };
meta = {
description = "Modular pentesting toolkit written in Go";
homepage = "https://github.com/vmfunc/sif";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ vmfunc ];
mainProgram = "sif";
};
}
@@ -18,7 +18,7 @@ let
in
buildNpmPackage rec {
pname = "super-productivity";
version = "17.1.2";
version = "17.1.5";
inherit nodejs;
@@ -26,7 +26,7 @@ buildNpmPackage rec {
owner = "johannesjo";
repo = "super-productivity";
tag = "v${version}";
hash = "sha256-n0WUg3DH+pVggd5KP0HL3qkOco8b5fAGwVsrq1bU3Sw=";
hash = "sha256-ECUn+0RFNYc5QgJYXMYQ0fWZ39WVErCNCIIkrual1P4=";
postFetch = ''
find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -69,7 +69,7 @@ buildNpmPackage rec {
dontInstall = true;
outputHashMode = "recursive";
hash = "sha256-it4vCA6Bs6qaJXMr2qhQcuAdHsMPz/c05RSiGpU+svk=";
hash = "sha256-tDQd3HVktivwyPaLF88fLLDwU6H7yX03DWrpFVkdDXk=";
}
);
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
zig
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+3 -3
View File
@@ -20,16 +20,16 @@ let
television = rustPlatform.buildRustPackage (finalAttrs: {
pname = "television";
version = "0.15.0";
version = "0.15.2";
src = fetchFromGitHub {
owner = "alexpasmantier";
repo = "television";
tag = finalAttrs.version;
hash = "sha256-WjIvsLO+LIDNEx2fEn0oe6YwrQYMhmRqWTomIoSH3Co=";
hash = "sha256-IE5l6j7sWRBcnujmCh78H5dGIAZtr5Nl62f2F5aQX1g=";
};
cargoHash = "sha256-AI7B4z8C+q3xcaB+BpPb0IIyZeDpWxx2qZVWPJkG/sY=";
cargoHash = "sha256-WHRSjq7J6qugWHiKlvVeLCmkg+M81AXbghavM1sVsLE=";
strictDeps = true;
nativeBuildInputs = [
+9 -13
View File
@@ -5,17 +5,17 @@
buildGoModule,
fetchFromGitHub,
installShellFiles,
testers,
trivy,
versionCheckHook,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "trivy";
version = "0.69.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = "trivy";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-auCbZmVr7LzYrw+IOpXBZPUs2YmcPAzr5fo12vSyHeM=";
};
@@ -29,13 +29,15 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${version}"
"-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${finalAttrs.version}"
];
env.GOEXPERIMENT = "jsonv2";
nativeBuildInputs = [ installShellFiles ];
nativeInstallCheckInputs = [ versionCheckHook ];
# Tests require network access
doCheck = false;
@@ -48,16 +50,10 @@ buildGoModule rec {
doInstallCheck = true;
passthru.tests.version = testers.testVersion {
package = trivy;
command = "trivy --version";
version = "Version: ${version}";
};
meta = {
description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI";
homepage = "https://github.com/aquasecurity/trivy";
changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}";
changelog = "https://github.com/aquasecurity/trivy/releases/tag/${finalAttrs.src.tag}";
longDescription = ''
Trivy is a simple and comprehensive vulnerability scanner for containers
and other artifacts. A software vulnerability is a glitch, flaw, or
@@ -72,4 +68,4 @@ buildGoModule rec {
jk
];
};
}
})
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ttl";
version = "0.15.3";
version = "0.16.0";
src = fetchFromGitHub {
owner = "lance0";
repo = "ttl";
tag = "v${finalAttrs.version}";
hash = "sha256-T2LeaqMXnYw0fBDwqbXvNnJ2TyLBsf0FzOpDqZICjOw=";
hash = "sha256-sMYkmCwgV6Yeg+NInjVeUyGa2DflYwFL+ky5Epyay9E=";
};
cargoHash = "sha256-tJUaQxW7NRZrWIajCO5E5oGPXDloQW0GVQ3HPpbYBhM=";
cargoHash = "sha256-ogen+VIEXLt4PnSwfOjuKiC0WcFbEJsh5w72hkqLBj8=";
nativeBuildInputs = [
installShellFiles
+4 -4
View File
@@ -46,19 +46,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "turbovnc";
version = "3.2.1";
version = "3.3";
src = fetchFromGitHub {
owner = "TurboVNC";
repo = "turbovnc";
rev = finalAttrs.version;
hash = "sha256-J+J4QRf21QLScgtwwSZCXoy0+6bwZFeXm4k4zk0h5Rs=";
hash = "sha256-nAlE4yJW6isst+aJ4Ryy23Cr9KF78nY769ucdQfSHXw=";
};
# Notes:
# * SSH support does not require `openssh` on PATH, because turbovnc
# uses a built-in SSH client ("JSch fork"), as commented on e.g.:
# https://github.com/TurboVNC/turbovnc/releases/tag/3.2.1beta1
# https://github.com/TurboVNC/turbovnc/releases/tag/3.3beta1
#
# TODO:
# * Build outputs that are unclear:
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
# use system libs
# TurboVNC >= 3.1.4 no longer needs overrides to use system libraries
# instead of bundling them, see
# https://github.com/TurboVNC/turbovnc/releases/tag/3.2.1beta1:
# https://github.com/TurboVNC/turbovnc/releases/tag/3.3beta1:
# > The TVNC_SYSTEMLIBS and TVNC_SYSTEMX11 CMake variables have been removed,
# > and the build system now behaves as if those variables are always on.
# > A new CMake variable (TVNC_ZLIBNG) can be used on x86 platforms
+88
View File
@@ -0,0 +1,88 @@
{
lib,
python3Packages,
fetchFromGitHub,
fetchurl,
rustPlatform,
pkg-config,
openssl,
pandoc,
}:
python3Packages.buildPythonApplication rec {
pname = "typ2docx";
version = "0.8.0";
pyproject = true;
src = fetchFromGitHub {
owner = "sghng";
repo = "typ2docx";
tag = "v${version}";
hash = "sha256-8Jb13qiS+dpyfJS4m2T6STzORs1VzRKwC8GGgEwiVtU=";
};
lockFile = fetchurl {
url = "https://github.com/sghng/typ2docx/releases/download/v${version}/Cargo.lock";
hash = "sha256-irWv7+uqNyyq42JVLSy9WQz78ynYVsYuQ8fk5nardWw=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit
pname
version
src
postPatch
;
hash = "sha256-Gvdj9izGCem0A3Cy7RBzNzJ57lxk5GRP8I2C2T6RsbY=";
};
postPatch = ''
ln -s ${lockFile} Cargo.lock
'';
nativeBuildInputs = [
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
pkg-config
];
build-system = with python3Packages; [
uv-build
];
dependencies = with python3Packages; [
pdf2docx
pdfservices-sdk
pypdf
rich
saxonche
typer
];
buildInputs = [
openssl
];
makeWrapperArgs = [
"--prefix"
"PATH"
":"
"${lib.makeBinPath [ pandoc ]}"
"--prefix"
"PYTHONPATH"
":"
"$PYTHONPATH"
];
passthru.updateScript = ./update.sh;
meta = {
description = "Convert Math-Rich Typst Project to Microsoft Word Format";
homepage = "https://github.com/sghng/typ2docx";
changelog = "https://github.com/sghng/typ2docx/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ hhr2020 ];
mainProgram = "typ2docx";
};
}
+17
View File
@@ -0,0 +1,17 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts nix-update jq gnused
set -eou pipefail
currentVersion=$(nix eval --raw -f . typ2docx.version)
latestVersion=$(curl --fail --silent ${GITHUB_TOKEN:+-H "Authorization: Bearer $GITHUB_TOKEN"} https://api.github.com/repos/sghng/typ2docx/releases/latest | jq --raw-output .tag_name | sed 's/^v//')
echo "latest version: $latestVersion"
echo "current version: $currentVersion"
if [[ "$latestVersion" == "$currentVersion" ]]; then
echo "package is up-to-date"
exit 0
fi
update-source-version typ2docx $latestVersion --source-key=lockFile --ignore-same-version
nix-update typ2docx --version skip
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "vacuum-go";
version = "0.23.5";
version = "0.23.8";
src = fetchFromGitHub {
owner = "daveshanley";
repo = "vacuum";
tag = "v${finalAttrs.version}";
hash = "sha256-ZRMhnmhuTCr3ulWLh4+yu1oyuyAFFoyuNNFTrzSW15I=";
hash = "sha256-YrYp9CL/ouFMC2agA6PT/OWKEDTRYR1uiR2JpQnS3wk=";
};
vendorHash = "sha256-kpW1i6LJUFMJArSHYMI4taTfAcfDH+E39GOBOKZFu+c=";
vendorHash = "sha256-86ie9wLBXnc4s5GAUiE0CiDkLl717GEN5PggXosMdRs=";
env.CGO_ENABLED = 0;
ldflags = [
+3 -3
View File
@@ -13,18 +13,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vivify";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "jannis-baum";
repo = "Vivify";
tag = "v${finalAttrs.version}";
hash = "sha256-h36kI8Pglo6Mvngg1whjMVjI0bv0v0+yPJCZTZ0BpUA=";
hash = "sha256-LjVxSf2rddg9DyAY6MAVFzuoxIT4d1a/8Wv8DukxeYM=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-RPi1yS1eKSwe/w0gzLhr0BGL00tHzpWAnaN3BEs7IWc=";
hash = "sha256-61NXUEpXIFJXRuIZgLAkDqsk6WvV7WU2Qm24ID0oDtw=";
};
installPhase = ''
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "vvvvvv";
version = "2.4.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "TerryCavanagh";
repo = "VVVVVV";
rev = version;
hash = "sha256-SYXuA7RJ0x4d1Lyvmk/R2nofEt5k7OJ91X6w3sGQOhg=";
hash = "sha256-IEspPNsKGWgukqmnb6nDORRetQp9jvUzJ/mSOTLGdmQ=";
fetchSubmodules = true;
};
+6
View File
@@ -67,6 +67,12 @@ stdenv.mkDerivation (finalAttrs: {
"--without-included-regex"
];
outputs = [
"out"
"man"
"info"
];
preBuild = ''
# avoid runtime references to build-only depends
make -C src version.c
+9 -9
View File
@@ -1,20 +1,20 @@
{
"aarch64-darwin": {
"version": "1.9544.26",
"version": "1.9544.35",
"vscodeVersion": "1.106.0",
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/c378df247aa57450376bd5346440192e1549717d/Windsurf-darwin-arm64-1.9544.26.zip",
"sha256": "1809bae6f96738a84f200f6f8d6cd4715094bc706cae85a7524191827407c733"
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/cb270b70c3a55fd43530de48988912a8d9cccb20/Windsurf-darwin-arm64-1.9544.35.zip",
"sha256": "84a0e84b5270e5f258ce968aa6bef1de649d90e35085109adb6aa30173dd74bd"
},
"x86_64-darwin": {
"version": "1.9544.26",
"version": "1.9544.35",
"vscodeVersion": "1.106.0",
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/c378df247aa57450376bd5346440192e1549717d/Windsurf-darwin-x64-1.9544.26.zip",
"sha256": "14a0a46ff1ab0fec7fbc9eae3b550e00df1523b0b7a973ae595c5911f970a8ed"
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/cb270b70c3a55fd43530de48988912a8d9cccb20/Windsurf-darwin-x64-1.9544.35.zip",
"sha256": "72d94091ea83b0c97ff7d8d372d096e4323c9fdadbd9276b6fc4b3f43d43fc96"
},
"x86_64-linux": {
"version": "1.9544.26",
"version": "1.9544.35",
"vscodeVersion": "1.106.0",
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/c378df247aa57450376bd5346440192e1549717d/Windsurf-linux-x64-1.9544.26.tar.gz",
"sha256": "8f5b5eed328f27875d7536dc09b4d6729bf10ea38b8a043e221c9434bda01170"
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/cb270b70c3a55fd43530de48988912a8d9cccb20/Windsurf-linux-x64-1.9544.35.tar.gz",
"sha256": "8e5a0e41e5caca80072db812b170ad3918923c10c0bdbce1fa851ae403034aa8"
}
}
+3 -3
View File
@@ -43,13 +43,13 @@ assert (
);
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xremap${variant.suffix or ""}";
version = "0.14.11";
version = "0.14.12";
src = fetchFromGitHub {
owner = "xremap";
repo = "xremap";
tag = "v${finalAttrs.version}";
hash = "sha256-UNiyUujijIAsEvCRuMZ1MVNwoY/v5Sbo3/2r8vdA6HM=";
hash = "sha256-2pNCdrmpqLTDH2CQBbjSh8OPa8mddp+Zsyq2Sc69Fuk=";
};
nativeBuildInputs = [ pkg-config ];
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildNoDefaultFeatures = true;
buildFeatures = variant.features;
cargoHash = "sha256-roa2Akc1XuSGGkBK++qYvmTgVwzA5xNlrf0TdTUoEdM=";
cargoHash = "sha256-ZNItWM+nWhFrvYswn5D9HtW83MWKOSR67KJn7Q+OEM0=";
passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
@@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-ui-toolkit";
version = "1.3.5902";
version = "1.3.5903";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-ui-toolkit";
rev = finalAttrs.version;
hash = "sha256-sNOWDx7pyYuO+Pi7YsPRbT1ChU/EhfHBuGW92H3EEKI=";
hash = "sha256-NdEYXv1LVblUgOu/P8z+vYnd/jNDS+/LFsh63ojJ2KA=";
};
outputs = [
+27 -9
View File
@@ -8,25 +8,43 @@
runCommand,
cctools,
darwin,
sources ? import ./sources.nix { inherit fetchurl; },
version ? sources.versionUsed,
}:
assert sources != null && (builtins.isAttrs sources);
stdenv.mkDerivation (finalAttrs: {
pname = "dart";
inherit version;
nativeBuildInputs = [ unzip ];
version = "3.10.9";
src =
sources."${version}-${stdenv.hostPlatform.system}"
or (throw "unsupported version/system: ${version}/${stdenv.hostPlatform.system}");
let
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
system = selectSystem {
x86_64-linux = "linux-x64";
aarch64-linux = "linux-arm64";
x86_64-darwin = "macos-x64";
aarch64-darwin = "macos-arm64";
};
hash = selectSystem {
x86_64-linux = "sha256-1DudOiG4LvKjfTGUW5nmuI9fjcROwZG0c/1inXjQuZQ=";
aarch64-linux = "sha256-Z8mPnmppTtPLNiY0Ny1pRzBAs3EoNtQsr82zxWwKBOs=";
x86_64-darwin = "sha256-pd37vWDOIKGdek/CuUSH7sVyiKqlLOW6GLT4IkzkwYA=";
aarch64-darwin = "sha256-99gMhvkzSJmYEsGuD3kBN1e3l685Xyy6cNICegC+Vk4=";
};
in
fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/${
if lib.strings.hasSuffix ".beta" finalAttrs.version then "beta" else "stable"
}/release/${finalAttrs.version}/sdk/dartsdk-${system}-release.zip";
inherit hash;
};
nativeBuildInputs = [ unzip ];
installPhase = ''
runHook preInstall
rm LICENSE
rm LICENSE README revision
cp -R . $out
''
+ lib.optionalString (stdenv.hostPlatform.isLinux) ''
@@ -1,23 +0,0 @@
let
version = "3.10.7";
in
{ fetchurl }:
{
versionUsed = version;
"${version}-x86_64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
hash = "sha256-EES4leNoHZWFs/nQUJTzN+cCKGzxiANpLJrkXb1UKdA=";
};
"${version}-aarch64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
hash = "sha256-ovQkvU5BpqXHUlUebUKKranJUERhZPsAsfO3N+4jzKs=";
};
"${version}-aarch64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
hash = "sha256-gb3NiChgaYFxPFE+PUN37u3sQxxGvzXzJ3xquvLXvVE=";
};
"${version}-x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
hash = "sha256-ik7qz012kOAzidYygkG8aaG2HLmA8j1Q9i66y1kg7HQ=";
};
}
+2 -2
View File
@@ -12,10 +12,10 @@ fi
MY_PATH=$(dirname $(realpath "$0"))
update-source-version dart $latestVersion --file=$MY_PATH/sources.nix
update-source-version dart $latestVersion --file=$MY_PATH/default.nix
systems=$(nix eval --json -f . dart.meta.platforms | jq --raw-output '.[]')
for system in $systems; do
hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . dart.src.url --system "$system")))
update-source-version dart $latestVersion $hash --file=$MY_PATH/sources.nix --system=$system --ignore-same-version --ignore-same-hash
update-source-version dart $latestVersion $hash --file=$MY_PATH/default.nix --system=$system --ignore-same-version --ignore-same-hash
done
+11 -22
View File
@@ -50,30 +50,19 @@ let
;
dart =
let
dartChannel = if lib.strings.hasSuffix ".beta" dartVersion then "beta" else "stable";
in
dart.override {
(dart.overrideAttrs (_: {
# This overrideAttrs is used to replace the version in src.url
version = dartVersion;
sources = {
"${dartVersion}-x86_64-linux" = fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/${dartChannel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
hash = dartHash.x86_64-linux;
__intentionallyOverridingVersion = true;
})).overrideAttrs
(oldAttrs: {
src = fetchzip {
inherit (oldAttrs.src) url;
hash =
dartHash.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
"${dartVersion}-aarch64-linux" = fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/${dartChannel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
hash = dartHash.aarch64-linux;
};
"${dartVersion}-x86_64-darwin" = fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/${dartChannel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
hash = dartHash.x86_64-darwin;
};
"${dartVersion}-aarch64-darwin" = fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/${dartChannel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
hash = dartHash.aarch64-darwin;
};
};
};
});
src =
let
source = fetchFromGitHub {
@@ -168,7 +168,7 @@ buildRedist (finalAttrs: {
# The cospi|sinpi|rsqrt function signatures in include/common/math_functions.h do not match
# glibc 2.42's.
# Indeed, there they are declared with noexcept(true) which is not the case in cuda_nvcc.
+ lib.optionals (lib.versionAtLeast glibc.version "2.42") ''
+ lib.optionalString (lib.versionAtLeast glibc.version "2.42") ''
nixLog "Patching math_functions.h signatures to match glibc's ones"
substituteInPlace "''${!outputInclude:?}/include/crt/math_functions.h" \
--replace-fail \
@@ -14,31 +14,28 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
python-dateutil,
syrupy,
time-machine,
tzlocal,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "aioautomower";
version = "2.7.2";
version = "2.7.3";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "Thomas55555";
repo = "aioautomower";
tag = "v${version}";
hash = "sha256-fRfcdE76BJE7GHobZU7mYmmtnN4gBxNd5KofdE0Sm0Y=";
tag = "v${finalAttrs.version}";
hash = "sha256-O1z0dhVtKfIOr7TrXFiPElC11isD4aDDLmzc0+OX+B8=";
};
postPatch = ''
# Upstream doesn't set a version
substituteInPlace pyproject.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
--replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"'
'';
build-system = [
@@ -78,8 +75,8 @@ buildPythonPackage rec {
meta = {
description = "Module to communicate with the Automower Connect API";
homepage = "https://github.com/Thomas55555/aioautomower";
changelog = "https://github.com/Thomas55555/aioautomower/releases/tag/${src.tag}";
changelog = "https://github.com/Thomas55555/aioautomower/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fab ];
};
}
})

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