Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -170,6 +170,8 @@
|
||||
|
||||
- `meta.mainProgram`: Changing this `meta` entry can lead to a package rebuild due to being used to determine the `NIX_MAIN_PROGRAM` environment variable.
|
||||
|
||||
- `forgejo-runner`: The upgrade to version 11 brings a license change from MIT to GPLv3-or-later.
|
||||
|
||||
- `lisp-modules` were brought in sync with the [June 2025 Quicklisp release](http://blog.quicklisp.org/2025/07/june-2025-quicklisp-dist-now-available.html).
|
||||
|
||||
- `ffmpeg_8`, `ffmpeg_8-headless`, and `ffmpeg_8-full` have been added. The default version of FFmpeg remains ffmpeg_7 for now, though this may change before release.
|
||||
|
||||
@@ -297,3 +297,5 @@
|
||||
- The `nettools` package (ifconfig, arp, mii-tool, netstat, route) is not installed by default anymore. The suite is unmaintained and users should migrate to `iproute2` and `ethtool` instead.
|
||||
|
||||
- `sparkleshare` has been removed as it no longer builds and has been abandoned upstream.
|
||||
|
||||
- The `open-webui` package's postgres support have been moved to optional dependencies to comply with upstream changes in 0.6.26.
|
||||
|
||||
@@ -16,40 +16,21 @@
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
concatStringsSep
|
||||
boolToString
|
||||
escape
|
||||
filterAttrs
|
||||
floatToString
|
||||
getVersion
|
||||
hasPrefix
|
||||
isBool
|
||||
isDerivation
|
||||
isFloat
|
||||
isInt
|
||||
isList
|
||||
isString
|
||||
literalExpression
|
||||
mapAttrsToList
|
||||
mkAfter
|
||||
mkIf
|
||||
mkOption
|
||||
mkRenamedOptionModuleWith
|
||||
optionalString
|
||||
optionals
|
||||
strings
|
||||
systems
|
||||
toPretty
|
||||
types
|
||||
versionAtLeast
|
||||
;
|
||||
|
||||
cfg = config.nix;
|
||||
|
||||
nixPackage = cfg.package.out;
|
||||
|
||||
isNixAtLeast = versionAtLeast (getVersion nixPackage);
|
||||
|
||||
defaultSystemFeatures = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
@@ -98,74 +79,17 @@ let
|
||||
attrsOf (either confAtom (listOf confAtom));
|
||||
|
||||
nixConf =
|
||||
assert isNixAtLeast "2.2";
|
||||
let
|
||||
|
||||
mkValueString =
|
||||
v:
|
||||
if v == null then
|
||||
""
|
||||
else if isInt v then
|
||||
toString v
|
||||
else if isBool v then
|
||||
boolToString v
|
||||
else if isFloat v then
|
||||
floatToString v
|
||||
else if isList v then
|
||||
toString v
|
||||
else if isDerivation v then
|
||||
toString v
|
||||
else if builtins.isPath v then
|
||||
toString v
|
||||
else if isString v then
|
||||
v
|
||||
else if strings.isConvertibleWithToString v then
|
||||
toString v
|
||||
else
|
||||
abort "The nix conf value: ${toPretty { } v} can not be encoded";
|
||||
|
||||
mkKeyValue = k: v: "${escape [ "=" ] k} = ${mkValueString v}";
|
||||
|
||||
mkKeyValuePairs = attrs: concatStringsSep "\n" (mapAttrsToList mkKeyValue attrs);
|
||||
|
||||
isExtra = key: hasPrefix "extra-" key;
|
||||
|
||||
in
|
||||
pkgs.writeTextFile {
|
||||
name = "nix.conf";
|
||||
# workaround for https://github.com/NixOS/nix/issues/9487
|
||||
# extra-* settings must come after their non-extra counterpart
|
||||
text = ''
|
||||
# WARNING: this file is generated from the nix.* options in
|
||||
# your NixOS configuration, typically
|
||||
# /etc/nixos/configuration.nix. Do not edit it!
|
||||
${mkKeyValuePairs (filterAttrs (key: value: !(isExtra key)) cfg.settings)}
|
||||
${mkKeyValuePairs (filterAttrs (key: value: isExtra key) cfg.settings)}
|
||||
${cfg.extraOptions}
|
||||
'';
|
||||
checkPhase = lib.optionalString cfg.checkConfig (
|
||||
if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then
|
||||
''
|
||||
echo "Ignoring validation for cross-compilation"
|
||||
''
|
||||
else
|
||||
let
|
||||
showCommand = if isNixAtLeast "2.20pre" then "config show" else "show-config";
|
||||
in
|
||||
''
|
||||
echo "Validating generated nix.conf"
|
||||
ln -s $out ./nix.conf
|
||||
set -e
|
||||
set +o pipefail
|
||||
NIX_CONF_DIR=$PWD \
|
||||
${cfg.package}/bin/nix ${showCommand} ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \
|
||||
${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \
|
||||
|& sed -e 's/^warning:/error:/' \
|
||||
| (! grep '${if cfg.checkAllErrors then "^error:" else "^error: unknown setting"}')
|
||||
set -o pipefail
|
||||
''
|
||||
);
|
||||
};
|
||||
(pkgs.formats.nixConf {
|
||||
inherit (cfg)
|
||||
package
|
||||
checkAllErrors
|
||||
checkConfig
|
||||
extraOptions
|
||||
;
|
||||
inherit (nixPackage) version;
|
||||
}).generate
|
||||
"nix.conf"
|
||||
cfg.settings;
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-reportd | grep -Pq 'Fetcher .* finished'")
|
||||
|
||||
# Enabling postfix should put sendmail as the sendmail setting
|
||||
machine.succeed("grep -q sendmail_script=sendmail /etc/tlsrpt/reportd.cfg")
|
||||
machine.succeed("grep -q sendmail_script=/run/wrappers/bin/sendmail /etc/tlsrpt/reportd.cfg")
|
||||
machine.succeed("getent group tlsrpt | grep -q postfix")
|
||||
|
||||
machine.log(machine.succeed("systemd-analyze security tlsrpt-collectd.service tlsrpt-reportd.service | grep -v ✓"))
|
||||
|
||||
@@ -49,13 +49,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clementine";
|
||||
version = "1.4.1-50-ge281c4508";
|
||||
version = "1.4.1-51-gea6466943";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clementine-player";
|
||||
repo = "Clementine";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MsOVCAKhOvJlQepvT32+ffJdMzx+sYlNM/HeUTaeC2Y=";
|
||||
hash = "sha256-aTsu8yYvvLWMZhAN0jYVlrlMtQ2+hTZOxFv8gmC2ZDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1985,8 +1985,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitlab-workflow";
|
||||
publisher = "gitlab";
|
||||
version = "6.38.1";
|
||||
hash = "sha256-OxzjqafPYOe6qMSI0cW3qAU6xbBrIpx47cDz8lJ9ZG0=";
|
||||
version = "6.40.1";
|
||||
hash = "sha256-FFuYM15NGqpS2efijAXCvXhvV2A87lshquEDPdGT9qk=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitLab extension for Visual Studio Code";
|
||||
|
||||
@@ -60,6 +60,11 @@ mkDerivation rec {
|
||||
sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
|
||||
};
|
||||
|
||||
# configure.ac:23: error: AC_CONFIG_MACRO_DIR can only be used once
|
||||
postPatch = ''
|
||||
sed -i "23d" src/hidapi/configure.ac
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
curl
|
||||
|
||||
@@ -335,13 +335,13 @@
|
||||
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-Zfsxcfi55RjG5Jq/MnDZ8yfOjg78ORrUMhK300EFxes=",
|
||||
"hash": "sha256-0ewJLIrKCdTAb3+up7xdbxXscr3hmcIWWcAEGp2TaG4=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.72.0",
|
||||
"rev": "v3.73.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Zi1SyC2SdYBMO0r7QVYS51XOodRG1JHcuIrMu0JRkn0="
|
||||
"vendorHash": "sha256-RsIuWBhiziUeil/buqOKNH5tPuuWcMoGbKKQUMH17sc="
|
||||
},
|
||||
"deno": {
|
||||
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
|
||||
@@ -633,11 +633,11 @@
|
||||
"vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM="
|
||||
},
|
||||
"huaweicloud": {
|
||||
"hash": "sha256-HDB4hUajFRyVCMZ3KAF0mSICsxdkFF2wNXGau3ggMQA=",
|
||||
"hash": "sha256-GHwwOk8ehMICu024vcJKEs1ruO7KZqIq+tvQIgPnbjg=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.77.6",
|
||||
"rev": "v1.78.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -831,13 +831,13 @@
|
||||
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
|
||||
},
|
||||
"migadu": {
|
||||
"hash": "sha256-lXt+MswcRy6ztxVciTQKc4oA5tfO3JlDO6xDo6SxlcQ=",
|
||||
"hash": "sha256-4nNOcRM3iOtEs7HVCXKhhERankS1DKUY7cApWcfnHLY=",
|
||||
"homepage": "https://registry.terraform.io/providers/metio/migadu",
|
||||
"owner": "metio",
|
||||
"repo": "terraform-provider-migadu",
|
||||
"rev": "2025.8.21",
|
||||
"rev": "2025.8.28",
|
||||
"spdx": "0BSD",
|
||||
"vendorHash": "sha256-GN1h8DXFeAQpg4v7S95VJs17HY4twFGoZKN1modJSRI="
|
||||
"vendorHash": "sha256-33hZ+MB96pFkHCG3UkKcnPp8wpE8POEHLz12OSF8ujI="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-XYo+nn9rgK9OtwdowqcTyuMir+7KPPjVeMLwFeWvdEQ=",
|
||||
@@ -994,13 +994,13 @@
|
||||
"vendorHash": "sha256-AlB9tC3KejgUAjjT2pY7Q2mTS/AV4QRusSnyPiOheXE="
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"hash": "sha256-B5Rp3C343Doq48dO+sid5P9Z0vXN6THdhEGdHnHvKD0=",
|
||||
"hash": "sha256-eZHDzF7029QKzvVegQnVVNe/BaG4m53tydcQlKeE57o=",
|
||||
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
|
||||
"owner": "opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.36.45",
|
||||
"rev": "v1.36.47",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-CWQRfXZuD4MrP8qvrZb98HMN9cRY3Gt4nF0cc+c7hnc="
|
||||
"vendorHash": "sha256-yTkPnoyOwp+eL8xDf4WISphw5IrGi3gL7WuLvG02rUE="
|
||||
},
|
||||
"openwrt": {
|
||||
"hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",
|
||||
@@ -1436,13 +1436,13 @@
|
||||
"vendorHash": "sha256-iqwdSzyVZE5CitzXc8rWn2zO3v+VvuDNeS0ll0V6MtU="
|
||||
},
|
||||
"utils": {
|
||||
"hash": "sha256-vCdPG8cZUdFhs1OmqDlgCDqBdyFiL99p6I8JhL8C6lY=",
|
||||
"hash": "sha256-TcCDv6IB6Z4llvogKWasAK4u2NFsOG4UKAUERDH6SXg=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudposse/utils",
|
||||
"owner": "cloudposse",
|
||||
"repo": "terraform-provider-utils",
|
||||
"rev": "v1.30.0",
|
||||
"rev": "v1.31.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-giqZi1CmuyANNwzW+y9BUUUEfBhFZKkVGAvIPVvZnzE="
|
||||
"vendorHash": "sha256-djz3kNV+13Sz9prRPhWaWi50hvYXq3I3cp4neLexeEs="
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-nY8NOE3VJCHkDeisWgxIHG6T1fQ8Jt6Nom2ELexuld0=",
|
||||
@@ -1463,13 +1463,13 @@
|
||||
"vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
|
||||
},
|
||||
"venafi": {
|
||||
"hash": "sha256-7JKsSAiZufOLVMpWVWI+lyWucJ/eqO7OWdSTkQC6VEc=",
|
||||
"hash": "sha256-VrGObs4l2MhawPe7KjUFgxRBiojfulX1cl1Wo7e4Ehg=",
|
||||
"homepage": "https://registry.terraform.io/providers/Venafi/venafi",
|
||||
"owner": "Venafi",
|
||||
"repo": "terraform-provider-venafi",
|
||||
"rev": "v0.22.4",
|
||||
"rev": "v0.23.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-3fuH/8dqf4jzORN6/ajapj/WclbwD65Nojs+cEdgJ7I="
|
||||
"vendorHash": "sha256-iaGvkHPBUrcca4Z3oPrX6qrtkitpnoiBnIpZPg54Z48="
|
||||
},
|
||||
"vinyldns": {
|
||||
"hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=",
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "all-the-package-names";
|
||||
version = "2.0.2186";
|
||||
version = "2.0.2197";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nice-registry";
|
||||
repo = "all-the-package-names";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-q35e9y2c5SBfpyjpkA/yuaJzmMx4OOnvhBCMX56KbQ4=";
|
||||
hash = "sha256-NuNgEsjB/5QDvfqfR22BUsVmwlSnmnCMwKAV/Oiz0Ww=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-2dwKIW5ZRoLqn8JR3UygO1IAXPd+DPznJIlKJanzWxg=";
|
||||
npmDepsHash = "sha256-DdE2870xe7ut0A+1/Rx/Xb3KOsNjB0heC8gkUZ0TGJ4=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.86";
|
||||
version = "2.0.88";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LUfRylbu5bium8zXYFMs+hP7cKr3UMEhn0evwhQqiz8=";
|
||||
sha256 = "sha256-YaSbXMY/MT8GznQtjG9MoC6fi6WV3QHV9UwsjGWaAFQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aFVLuJLy3Dxe66yAQbnpCy5Bqnzn5jVIlzTOrkJ4jC0=";
|
||||
cargoHash = "sha256-DKcQ3O9Db0CRjHZVrceMPFSqkIwgFO7z5AmFd88rr1U=";
|
||||
|
||||
meta = {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "better-commits";
|
||||
version = "1.17.1";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Everduin94";
|
||||
repo = "better-commits";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dalCpupefZT1VDOo+U2MvqeWh1whi8w/697VOFJyuDw=";
|
||||
hash = "sha256-eAxtec1T1kwIMhzKYpy4rkYScjXVaclu3bOUbANz6b8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-g34UutgT5315BpsQSuGGLIU6Ga+hpEz74HNLKKOB+ec=";
|
||||
npmDepsHash = "sha256-lPJ50DYnANJZ3IowE3kOCyAx9peq7Donh72jk1eQnBs=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "biome";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "@biomejs/biome@${finalAttrs.version}";
|
||||
hash = "sha256-YmDHAsNGN5lsCgiciASdMUM6InbbjaGwyfyEX+XNOxs=";
|
||||
hash = "sha256-xfaF9wg8nWXFWfJCp25sIi65RjZJaRlNSEAboYl3zKI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-l3BQMG/cCxzQizeFGwAEDP8mzLtf/21ojyd+7gzhbtU=";
|
||||
cargoHash = "sha256-8oN+eSR/+b0MRnN0/nYsAikhGahPH5imV5M2OKso9Bg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation {
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString withRoundedCorners ''
|
||||
find src -name theme.conf -exec sed -iE 's/^# (Image=(panel|highlight).svg)/\1/' {} +
|
||||
find src -name theme.conf -exec sed -i -E 's/^# (Image=(panel|highlight).svg)/\1/' {} +
|
||||
''
|
||||
+ ''
|
||||
mkdir -p $out/share/fcitx5
|
||||
|
||||
@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
${lib.optionalString (background != null) ''
|
||||
substituteInPlace $configFile \
|
||||
--replace-fail 'Background="backgrounds/wall.jpg"' 'Background="${background}"' \
|
||||
--replace-fail 'Background="backgrounds/wall.png"' 'Background="${background}"' \
|
||||
--replace-fail 'CustomBackground="false"' 'CustomBackground="true"'
|
||||
''}
|
||||
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "copybara";
|
||||
version = "20250825";
|
||||
version = "20250901";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
|
||||
hash = "sha256-CfmH4fktb05/jGFFhRdbYyPfA6A95+zidOvgvAJ79b0=";
|
||||
hash = "sha256-yewUQIfQIMQMX92l2Cth76zfsMErpfhSa3/pZ8FZEYA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.207.5";
|
||||
version = "0.207.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-THgW9+y634THKS1Co3e4kIkeS6Lmg7mTg9YYeuLyrZI=";
|
||||
hash = "sha256-BbX3SXvf6JtWdC5S6jDqBVawMEPtwHBA2IfR5G5ybqA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1+5SNgYblHRDpL+O1GGtvPR7pJ6lsEM/At7RMbzB5sA=";
|
||||
vendorHash = "sha256-ieaDJZmYPxG79Pz/9NRTEhtAQZOqAwwDMa0FAs+PWEA=";
|
||||
|
||||
commonMeta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -41,17 +41,17 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo-runner";
|
||||
version = "10.0.1";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "code.forgejo.org";
|
||||
owner = "forgejo";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-p9inpt3v5KnKWdkkr2viL3KxN2fawesjaziyl2QsYko=";
|
||||
hash = "sha256-R4YQHU1ZYLO45hLJPgXb6HUiQ8nuC6oyN1blPJ1hUs8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/LoNiNgUCFDW/nlqiDXvr2m0UwFNtyOewGmd1F35YEg=";
|
||||
vendorHash = "sha256-IWlovmpnnQlP4J/eRkiOgmGyZR6uvBwfRzwW3Ui9dWE=";
|
||||
|
||||
# See upstream Makefile
|
||||
# https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile
|
||||
@@ -63,7 +63,7 @@ buildGoModule rec {
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X code.forgejo.org/forgejo/runner/v9/internal/pkg/ver.version=${src.rev}"
|
||||
"-X code.forgejo.org/forgejo/runner/v11/internal/pkg/ver.version=${src.rev}"
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
@@ -94,7 +94,7 @@ buildGoModule rec {
|
||||
description = "Runner for Forgejo based on act";
|
||||
homepage = "https://code.forgejo.org/forgejo/runner";
|
||||
changelog = "https://code.forgejo.org/forgejo/runner/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
adamcstephens
|
||||
emilylange
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-codereview";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "review";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xokVMjCtpIugdO9JIoKPMg0neajsULn3okMXW82nCQg=";
|
||||
hash = "sha256-mcyijASjm4DeXsh5ZPLoYuRypCeIbp2FcSIDA0M+l2g=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-town";
|
||||
version = "21.4.3";
|
||||
version = "21.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-E3j1lWQycB6aIj8xXaRUJdtrrvc92kxJjXhSHq3TBy0=";
|
||||
hash = "sha256-H0WfUBrXPkqS2UnZpL6TyguzOa34KMetCwMKIvNKJ28=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -52,6 +52,11 @@ buildGoModule (finalAttrs: {
|
||||
"cmd/go-away"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/go-away
|
||||
cp -rv examples/snippets $out/lib/go-away/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://git.gammaspectra.live/git/go-away/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Self-hosted abuse detection and rule enforcement against low-effort mass AI scraping and bots";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "golds";
|
||||
version = "0.7.8";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go101";
|
||||
repo = "golds";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sK7mnvIy8xgsb/K73bEsp1x667AXrDJXSXjFbOSoX9A=";
|
||||
hash = "sha256-RM9ltqkOByOg1ZUF7ZXZcWTivlUKrNbZYgcFpwRwNUk=";
|
||||
};
|
||||
|
||||
# nixpkgs is not using the go distpack archive and missing a VERSION file in the source
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jellyfin-tui";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhonus";
|
||||
repo = "jellyfin-tui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fRlnfCHjUZWvp+pYxLUXFxW/nR7Glhhfm4YQKLR2XaY=";
|
||||
hash = "sha256-BrIXKMRKsBcLKIe2cFU8IULn060hcAYITgFF9zEEnn4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VUg96qyTF7XkZsl4wl70u5S9NqgRCGJ4od8Cj4dSoI8=";
|
||||
cargoHash = "sha256-49UuHH6Ql/ORkp3626O3JW89W5dxX2Y1Jn8euTTKpr8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "komodo";
|
||||
version = "1.19.1";
|
||||
version = "1.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moghtech";
|
||||
repo = "komodo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eDHkXHOw+6lVb0oMW0BIR/yAYMw4ROod7AKw65pj0Co=";
|
||||
hash = "sha256-D6W9+JDvLpyALOAjFRcWtJcZMav0ypKmhhVhqlh4AgM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-C5VMze6NS5Qgx4LWy8xojFv/HFwksGBkVkzRwec7M88=";
|
||||
cargoHash = "sha256-uZYNdKhZ91JN6NR3gWVP82rhy6db1qI/h+qmiVwxYT8=";
|
||||
|
||||
# disable for check. document generation is fail
|
||||
# > error: doctest failed, to rerun pass `-p komodo_client --doc`
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "npm-check-updates";
|
||||
version = "18.0.3";
|
||||
version = "18.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raineorshine";
|
||||
repo = "npm-check-updates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LqnewJGdiT06yK/I4NPGx+qRyoKnaRfVTa+iNV0kYxE=";
|
||||
hash = "sha256-vFcghhJTJJMl+0GrnEsTj6NUDW4GSU3wOi0KsNreC5k=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-BV2DJN6L+zJHQtryjTW0On5upY2bkc3df4qUrnf1/Cg=";
|
||||
npmDepsHash = "sha256-Y1yl2kF8CPArDgeEYj0aP8Zx61mQMRxDg3WEwRdvoHc=";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/"prepare"/d' package.json
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.6.25";
|
||||
version = "0.6.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XB3cwxtcOVoAwGJroZuPT8XwaCo3wpkn2KIEuuXMeu4=";
|
||||
hash = "sha256-ourzYHwVSlM4nqEbkKf6PsNfNkW8quXdcBSW0p16pIg=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-WL1kdXn7uAaBEwWiIJzzisMZ1uiaOVtFViWK/kW6lsY=";
|
||||
npmDepsHash = "sha256-xZtES8qZ7MTt/OviEqGmGO3D3BuOpMGHjnBuSsdFJgM=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
@@ -85,12 +85,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"docker"
|
||||
"pytest"
|
||||
"pytest-docker"
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
@@ -126,7 +120,6 @@ python3Packages.buildPythonApplication rec {
|
||||
firecrawl-py
|
||||
fpdf2
|
||||
ftfy
|
||||
gcp-storage-emulator
|
||||
google-api-python-client
|
||||
google-auth-httplib2
|
||||
google-auth-oauthlib
|
||||
@@ -139,11 +132,9 @@ python3Packages.buildPythonApplication rec {
|
||||
langchain
|
||||
langchain-community
|
||||
langdetect
|
||||
langfuse
|
||||
ldap3
|
||||
loguru
|
||||
markdown
|
||||
moto
|
||||
nltk
|
||||
onnxruntime
|
||||
openai
|
||||
@@ -172,14 +163,12 @@ python3Packages.buildPythonApplication rec {
|
||||
playwright
|
||||
posthog
|
||||
psutil
|
||||
psycopg2-binary
|
||||
pyarrow
|
||||
pycrdt
|
||||
pydub
|
||||
pyjwt
|
||||
pymdown-extensions
|
||||
pymilvus
|
||||
pymongo
|
||||
pymysql
|
||||
pypandoc
|
||||
pypdf
|
||||
@@ -209,7 +198,22 @@ python3Packages.buildPythonApplication rec {
|
||||
xlrd
|
||||
youtube-transcript-api
|
||||
]
|
||||
++ moto.optional-dependencies.s3;
|
||||
++ pyjwt.optional-dependencies.crypto;
|
||||
|
||||
optional-dependencies = with python3Packages; rec {
|
||||
postgres = [
|
||||
pgvector
|
||||
psycopg2-binary
|
||||
];
|
||||
|
||||
all = [
|
||||
moto
|
||||
gcp-storage-emulator
|
||||
pymongo
|
||||
]
|
||||
++ moto.optional-dependencies.s3
|
||||
++ postgres;
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "open_webui" ];
|
||||
|
||||
@@ -247,6 +251,7 @@ python3Packages.buildPythonApplication rec {
|
||||
mainProgram = "open-webui";
|
||||
maintainers = with lib.maintainers; [
|
||||
shivaraj-bh
|
||||
codgician
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -36,13 +36,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openvscode-server";
|
||||
version = "1.102.3";
|
||||
version = "1.103.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitpod-io";
|
||||
repo = "openvscode-server";
|
||||
rev = "openvscode-server-v${finalAttrs.version}";
|
||||
hash = "sha256-WY2vmDt3sSgbyouGxBFfJ0hZZ5ZJWhBnTvegyq4zmFM=";
|
||||
hash = "sha256-Co0MF8Yr60Ppv6Zv85nJeua2S5Rnye6wGB1hTWNpMm4=";
|
||||
};
|
||||
|
||||
## fetchNpmDeps doesn't correctly process git dependencies
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) src nativeBuildInputs;
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-ElxgztLu6MCdP0c+D/gUmztsQ2hNqJjmRWpJu3N2Z1g=";
|
||||
outputHash = "sha256-xK4qfzkWuOsEyP1+6cY5Dhrr5wNW3eOJBTyQaE6gTcc=";
|
||||
env = {
|
||||
FORCE_EMPTY_CACHE = true;
|
||||
FORCE_GIT_DEPS = true;
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
xorg,
|
||||
}:
|
||||
let
|
||||
version = "2.18.3";
|
||||
version = "2.18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rr1QfTNutKO+DwEQmltxdtjuk07mT0unlYo3SMq6oEs=";
|
||||
hash = "sha256-sQ5laFO6DSg+4tF9jk2yuV0q2Vp7VC/+hu2XrVj8/bY=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
@@ -79,8 +79,8 @@ let
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-bx/jXlG3lRiwKyz1M0dU00Xn5xaeALSIxIAGzo8gAgo=";
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-fs9a2uI/TnWalQ/qRb6m4d1CsU7O6VYCJMz2xWLdC0I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pgroll";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xataio";
|
||||
repo = "pgroll";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5g9adfp0kJ/Qou7TnTb6Pu04u2LXPfUct8Xkkodf1S8=";
|
||||
hash = "sha256-tSiGzWxnxiNzBSory5sd676+iVwsl/nkbDWaCls52MQ=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-pK1cR62cGt1OE8Rz2qTb6ZBDCnuqes9HJGY7QOREv6E=";
|
||||
vendorHash = "sha256-rQPWL39AD/qCneuRyJHOQCANmDE7pqmwHx+AavJ/3cw=";
|
||||
|
||||
excludedPackages = [ "dev" ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "reindeer";
|
||||
version = "2025.08.25.00";
|
||||
version = "2025.09.01.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookincubator";
|
||||
repo = "reindeer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lrDfufxABC4noqHvG6vt2AjWI+O2pPrJLki67GnrB24=";
|
||||
hash = "sha256-C9mS3l0vv7Za5Zy10WiXXcYCV+ZTp97feu5f0zB7tZM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7szjy2scCSedkHahWOCIxMrDh7f+nWYpK8BpKT6P9tE=";
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "06.00.01";
|
||||
version = "06.01.00";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.skoll.ca";
|
||||
owner = "Skollsoft-Public";
|
||||
repo = "Remind";
|
||||
rev = version;
|
||||
hash = "sha256-+0G7Bz5vAAKCPVznYWdX5NKXVGrZ86oHx2sevOzPcBI=";
|
||||
hash = "sha256-1M1cKyonDydYl+UtScMwtp7DBQEFceaSXSUvMseKzzA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals withGui [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rustical";
|
||||
version = "0.9.1";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lennart-k";
|
||||
repo = "rustical";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Kp1s9c1GCvz5aCbjjIHtIxhbgOgrWFG2TUg6bDSm3ZA=";
|
||||
hash = "sha256-2nKK+mVBbgaz0jgey54nAXeRQ2arVUvBUoTmQviL44k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Fvstze4YfBcbBQiVXjxtPo+h6GGcfmiCNuvtfviyP2o=";
|
||||
cargoHash = "sha256-e87lVUXznWpbfp17bAYKMa6gIyBKGwwFWzXBdlNMPYU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.5.5";
|
||||
version = "0.6.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "sd-switch";
|
||||
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "~rycee";
|
||||
repo = "sd-switch";
|
||||
rev = version;
|
||||
hash = "sha256-hhT7w76bQe5USHGOQ6Rg8XEW+4JIccAXkfGj86id/Ec=";
|
||||
hash = "sha256-IZ2tyQzWa2Uk002P9jCiaIV3huRiFdTe8eYXVQPBBJI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-88jNiOYEikqnY69Bceaz32rQHN9BOy2/r4LiOiqsR4Y=";
|
||||
cargoHash = "sha256-ExQPCA8sAZVE5uB1KUnq6PXGhG1IZjzM9eFwYW3oJtE=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sdl_gamecontrollerdb";
|
||||
version = "0-unstable-2025-08-25";
|
||||
version = "0-unstable-2025-09-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdqinc";
|
||||
repo = "SDL_GameControllerDB";
|
||||
rev = "992a0caf690e32a332a9707c355a4444516a2764";
|
||||
hash = "sha256-hv1xtAXpSQlzO1nSUkFaeoth4o0V7aUjzZgqnehezaY=";
|
||||
rev = "86e83c3c9c1c3574df44bbb9d28513bfee8a8e3b";
|
||||
hash = "sha256-0ynh2TbwCtkrA4i5i0pR+oIE4Y49JxMQex3SKmKHWKk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "2.40.0";
|
||||
version = "2.40.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j/MtVPFs1nQAOggXWPUabyNqaKmuFF3HmBUJ3AF9Wys=";
|
||||
hash = "sha256-SZ0lmOeT3gPEX/13vmN6c1exweFIf8UIB8TJJw1d49U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yeZdUfXyWI/F5Y7lv5RB2cNN3fmVlWRyfm+v5xBGmRo=";
|
||||
vendorHash = "sha256-WxgDEMw6IWmREe1Z9IUER3aWLP4xoUrqrUCE6u2J3aI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "talhelper";
|
||||
version = "3.0.33";
|
||||
version = "3.0.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "budimanjojo";
|
||||
repo = "talhelper";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8C3I+cP07BXB9/pd3Vt4KLqgfcGFbCy8uViZ6+44hVQ=";
|
||||
hash = "sha256-RQCtEIfANb+x8lqOu91jkahVV2+CYFbS9pXsLTXGEQE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ya7dhbuvLh3mWjtdJkFqtlyiQtZqI4SkW2coGSteQak=";
|
||||
vendorHash = "sha256-3EOa23M6sQ+FZcUA40BdMfjerLRJAZTbz3Fw/QAaP14=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -31,13 +31,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "telepresence2";
|
||||
version = "2.24.0";
|
||||
version = "2.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telepresenceio";
|
||||
repo = "telepresence";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aqL2AjDscN6o9WKur3ed5SU3XQJy6hAu/QUD7Fh/0pE=";
|
||||
hash = "sha256-f9KlDKLRLmYAGMWdlKb4PbGZ+hn8J55EAmQ19oJ5+q4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -51,7 +51,7 @@ buildGoModule rec {
|
||||
export CGO_ENABLED=0
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-ncMquDrlkcf71voCbxadOM+EKO/7olMEAf5FOFoxrvA=";
|
||||
vendorHash = "sha256-I2FyoOKSU1h6a2LwmAdFKGIcqVGbtxujjarqdSX7HFI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-discord-presence";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xhyrom";
|
||||
repo = "zed-discord-presence";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0y28W54JZtjGmgrI7A0Ews+GKHK96nX0ejHMuqxjvh4=";
|
||||
hash = "sha256-jqsXGNhvkQgGYHlv39zVZpQhSU5BUxHxl07x/yv7tzU=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package discord-presence-lsp" ];
|
||||
cargoHash = "sha256-D2apZowN+NDcMTLnGDbFUIdiGckFsuUhlrW6an8ZdGE=";
|
||||
cargoHash = "sha256-1lcnw79UURe7LUuV2q9+CwUzVxG34J6cAxIgORbjLnU=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
# build-system
|
||||
setuptools,
|
||||
# dependencies
|
||||
colcon,
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
scspell,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "colcon-recursive-crawl";
|
||||
version = "0.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "colcon";
|
||||
repo = "colcon-recursive-crawl";
|
||||
tag = version;
|
||||
hash = "sha256-zmmEelMjsIbXy5LchZMtr2+x+Ne2c2PhexLjbkZJmm8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
colcon
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
scspell
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Skip the linter tests that require additional dependencies
|
||||
"test/test_flake8.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "colcon_recursive_crawl" ];
|
||||
|
||||
meta = {
|
||||
description = "Extension for colcon to recursively crawl for packages";
|
||||
homepage = "https://colcon.readthedocs.io/";
|
||||
downloadPage = "https://github.com/colcon/colcon-recursive-crawl";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ guelakais ];
|
||||
};
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-extfs";
|
||||
version = "3.13";
|
||||
version = "3.14";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.extfs";
|
||||
tag = version;
|
||||
hash = "sha256-MAe3AJlDn8CX9xO0XU369EXnvJXTBGYZ2xD+BjG2vk4=";
|
||||
hash = "sha256-BoEvLDjLKXX0oNfKkgLFkNovJuQozsAt+W1efYsqiiU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-shellitem";
|
||||
version = "3.11";
|
||||
version = "3.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.shellitem";
|
||||
tag = version;
|
||||
hash = "sha256-mHcH6lgTyv1DlEccYRitfby7WMJc3/71ef/OurW3EEw=";
|
||||
hash = "sha256-mklMNKW3amPed2qXWVUxl73O9iORdauTh1ZygY/rg7I=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-sql";
|
||||
version = "3.11";
|
||||
version = "3.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.sql";
|
||||
tag = version;
|
||||
hash = "sha256-1rIsG4TUv7JkNMiyGCbEEnnp2RccP8QksE91p3z1zjY=";
|
||||
hash = "sha256-pkyiPyw6TOdi4kh/LusqWL2/UknQC48XkFiZr/4/fHg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-squashfs";
|
||||
version = "1.9";
|
||||
version = "1.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.squashfs";
|
||||
tag = version;
|
||||
hash = "sha256-8u+pWUTUr4Warhb28XTxVU/jzOkXW+O6V8gDoAAlAbc=";
|
||||
hash = "sha256-DFcC633TboQAwpLUKlRsVLN4PBGS8acOh/zCrv8ao8Y=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkdocstrings";
|
||||
repo = "griffe";
|
||||
tag = version;
|
||||
hash = "sha256-PaOdK9ZMId87Hg1QzSX2SsgNED3kOFolUfSWSZ42VSQ=";
|
||||
hash = "sha256-0koTrA1b3S1NO6w24S8eghWpYDkGEo61giRveQ7MZhM=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@@ -61,14 +61,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "litestar";
|
||||
version = "2.16.0";
|
||||
version = "2.17.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "litestar-org";
|
||||
repo = "litestar";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-67O/NxPBBLa1QfH1o9laOAQEin8jRA8SkcV7QEzCjI0=";
|
||||
hash = "sha256-jUd0Nf3OmcKmO7DAXMqBXZPw3+heAQszcgE2xT+lAyA=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -57,10 +57,9 @@ buildPythonPackage rec {
|
||||
uproot
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
disabledTestPaths = [
|
||||
# requires uproot4
|
||||
"test_inputs_uproot"
|
||||
"test_uproot_versions"
|
||||
"tests/test_inputs.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mplhep" ];
|
||||
|
||||
@@ -48,14 +48,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "parsedmarc";
|
||||
version = "8.18.6";
|
||||
version = "6.18.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "domainaware";
|
||||
repo = "parsedmarc";
|
||||
tag = version;
|
||||
hash = "sha256-wwncnkZnd8GsjvwsuJEgFYCtapzGYYcVBRYoJ1cwVEw=";
|
||||
hash = "sha256-AjRYd3uN76Zl7IEXqFK+qssAvuS+TbT+mZL+pPlxDwc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-zunclient";
|
||||
version = "5.2.1";
|
||||
version = "5.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "openstack";
|
||||
repo = "python-zunclient";
|
||||
tag = version;
|
||||
hash = "sha256-YdE5a/qm91Nv2TW9pot9sn5GwvnFuqPCgiuLF6O7reA=";
|
||||
hash = "sha256-qBpsahkVZEQwsVcNJFtRSJvvxGITauAJ6Zv8p+70hh0=";
|
||||
};
|
||||
|
||||
env.PBR_VERSION = version;
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reqif";
|
||||
version = "0.0.46";
|
||||
version = "0.0.47";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strictdoc-project";
|
||||
repo = "reqif";
|
||||
tag = version;
|
||||
hash = "sha256-QI+OhhV+jKw3g2erSCdTj10JW+XFQQyXuAC0LAnts7c=";
|
||||
hash = "sha256-z7krly5X5OlrmAlm4bZZ3eP8lvx3HUY3Z8K/6AiBOfQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "12.5.0";
|
||||
version = "12.5.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zSuOcSFrau1dwem15vZYteIdaaYNRPuMCPQeH3vd7dA=";
|
||||
hash = "sha256-VAfQksNVwxOT52fS3LLVqMOYDKqaBzrLMtDMs8AbBLU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "webauthn";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "duo-labs";
|
||||
repo = "py_webauthn";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TMEwgEXkd2ZTd3jWv94IS+GiGb8vdwourWWXWcnXpcg=";
|
||||
hash = "sha256-aZDptKJPFU6Oo4vKkIWkqkJ5ogDe5x3v7PAQRixWFe4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zipstream-ng";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pR0Ps";
|
||||
repo = "zipstream-ng";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mmPxzml+gaVg2IQ/Gql+3ru0hHosbyX4WjLCMxD/MJw=";
|
||||
hash = "sha256-dkSTZkj6Rx6OMdlX4oDOydetosf/iEJhlARmEc0W9gQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
+104
-1
@@ -1,11 +1,16 @@
|
||||
{ lib, pkgs }:
|
||||
let
|
||||
inherit (lib)
|
||||
boolToString
|
||||
concatStringsSep
|
||||
escape
|
||||
filterAttrs
|
||||
flatten
|
||||
hasPrefix
|
||||
id
|
||||
isAttrs
|
||||
isBool
|
||||
isDerivation
|
||||
isFloat
|
||||
isInt
|
||||
isList
|
||||
@@ -16,8 +21,11 @@ let
|
||||
optionalAttrs
|
||||
optionalString
|
||||
pipe
|
||||
types
|
||||
singleton
|
||||
strings
|
||||
toPretty
|
||||
types
|
||||
versionAtLeast
|
||||
warn
|
||||
;
|
||||
|
||||
@@ -863,6 +871,101 @@ optionalAttrs allowAliases aliases
|
||||
lib.mkRaw = lib.mkLuaInline;
|
||||
};
|
||||
|
||||
nixConf =
|
||||
{
|
||||
package,
|
||||
version,
|
||||
extraOptions ? "",
|
||||
checkAllErrors ? true,
|
||||
checkConfig ? true,
|
||||
}:
|
||||
let
|
||||
isNixAtLeast = versionAtLeast version;
|
||||
in
|
||||
assert isNixAtLeast "2.2";
|
||||
{
|
||||
type =
|
||||
let
|
||||
atomType = nullOr (oneOf [
|
||||
bool
|
||||
int
|
||||
float
|
||||
str
|
||||
path
|
||||
package
|
||||
]);
|
||||
in
|
||||
attrsOf atomType;
|
||||
generate =
|
||||
name: value:
|
||||
let
|
||||
|
||||
# note that list type has been omitted here as the separator varies, see `nix.settings.*`
|
||||
mkValueString =
|
||||
v:
|
||||
if v == null then
|
||||
""
|
||||
else if isInt v then
|
||||
toString v
|
||||
else if isBool v then
|
||||
boolToString v
|
||||
else if isFloat v then
|
||||
strings.floatToString v
|
||||
else if isDerivation v then
|
||||
toString v
|
||||
else if builtins.isPath v then
|
||||
toString v
|
||||
else if isString v then
|
||||
v
|
||||
else if strings.isConvertibleWithToString v then
|
||||
toString v
|
||||
else
|
||||
abort "The nix conf value: ${toPretty { } v} can not be encoded";
|
||||
|
||||
mkKeyValue = k: v: "${escape [ "=" ] k} = ${mkValueString v}";
|
||||
|
||||
mkKeyValuePairs = attrs: concatStringsSep "\n" (mapAttrsToList mkKeyValue attrs);
|
||||
|
||||
isExtra = key: hasPrefix "extra-" key;
|
||||
|
||||
in
|
||||
pkgs.writeTextFile {
|
||||
inherit name;
|
||||
# workaround for https://github.com/NixOS/nix/issues/9487
|
||||
# extra-* settings must come after their non-extra counterpart
|
||||
text = ''
|
||||
# WARNING: this file is generated from the nix.* options in
|
||||
# your NixOS configuration, typically
|
||||
# /etc/nixos/configuration.nix. Do not edit it!
|
||||
${mkKeyValuePairs (filterAttrs (key: _: !(isExtra key)) value)}
|
||||
${mkKeyValuePairs (filterAttrs (key: _: isExtra key) value)}
|
||||
${extraOptions}
|
||||
'';
|
||||
checkPhase = lib.optionalString checkConfig (
|
||||
if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then
|
||||
''
|
||||
echo "Ignoring validation for cross-compilation"
|
||||
''
|
||||
else
|
||||
let
|
||||
showCommand = if isNixAtLeast "2.20pre" then "config show" else "show-config";
|
||||
in
|
||||
''
|
||||
echo "Validating generated nix.conf"
|
||||
ln -s $out ./nix.conf
|
||||
set -e
|
||||
set +o pipefail
|
||||
NIX_CONF_DIR=$PWD \
|
||||
${package}/bin/nix ${showCommand} ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \
|
||||
${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \
|
||||
|& sed -e 's/^warning:/error:/' \
|
||||
| (! grep '${if checkAllErrors then "^error:" else "^error: unknown setting"}')
|
||||
set -o pipefail
|
||||
''
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
# Outputs a succession of Python variable assignments
|
||||
# Useful for many Django-based services
|
||||
pythonVars =
|
||||
|
||||
@@ -850,6 +850,31 @@ runBuildTests {
|
||||
'';
|
||||
};
|
||||
|
||||
nixConfAtoms = shouldPass {
|
||||
format = formats.nixConf {
|
||||
package = pkgs.nix;
|
||||
version = pkgs.nix.version;
|
||||
extraOptions = ''ignore-try = false'';
|
||||
};
|
||||
input = {
|
||||
auto-optimise-store = true;
|
||||
cores = 0;
|
||||
store = "auto";
|
||||
};
|
||||
# note that null type is hard to test here,
|
||||
# as it involves a trailing space our formatter will remove here
|
||||
expected = ''
|
||||
# WARNING: this file is generated from the nix.* options in
|
||||
# your NixOS configuration, typically
|
||||
# /etc/nixos/configuration.nix. Do not edit it!
|
||||
auto-optimise-store = true
|
||||
cores = 0
|
||||
store = auto
|
||||
|
||||
ignore-try = false
|
||||
'';
|
||||
};
|
||||
|
||||
phpAtoms = shouldPass rec {
|
||||
format = formats.php { finalVariable = "config"; };
|
||||
input = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildFishPlugin {
|
||||
pname = "exercism-cli-fish-wrapper";
|
||||
version = "0-unstable-2025-07-14";
|
||||
version = "0-unstable-2025-09-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glennj";
|
||||
repo = "exercism-cli-fish-wrapper";
|
||||
rev = "bb03e058d4e9c5d5918e27ae7e046fff2c91adb0";
|
||||
hash = "sha256-taIZSyaObVmnjp6ME/QgGKlWZoeOmgRVRLYC0bb8XWk=";
|
||||
rev = "446420f62144aa6b1cbdd64d0429ba8bd4123dfc";
|
||||
hash = "sha256-HTRC47BMQaVkxXr2f81enL2Tr9ZoFN3X5RZdmAiGXtU=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
@@ -25,18 +25,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
echo "${finalAttrs.version}" > VERSION
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
echo '#define VERSION "${finalAttrs.version}"' > version
|
||||
substituteInPlace configure --replace-fail "macx-g++" "macx-clang"
|
||||
'';
|
||||
|
||||
postAutoreconf = ''
|
||||
substituteInPlace configure --replace-fail "macx-g++" "macx-clang"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
perl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ autoreconfHook ]
|
||||
++ lib.optionals enableGUI [ libsForQt5.qt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -414,9 +414,7 @@ with pkgs;
|
||||
name = "die-hook";
|
||||
} ../build-support/setup-hooks/die.sh;
|
||||
|
||||
digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
|
||||
|
||||
devShellTools = callPackage ../build-support/dev-shell-tools { };
|
||||
|
||||
|
||||
@@ -2823,6 +2823,8 @@ self: super: with self; {
|
||||
|
||||
colcon-parallel-executor = callPackage ../development/python-modules/colcon-parallel-executor { };
|
||||
|
||||
colcon-recursive-crawl = callPackage ../development/python-modules/colcon-recursive-crawl { };
|
||||
|
||||
colcon-ros-domain-id-coordinator =
|
||||
callPackage ../development/python-modules/colcon-ros-domain-id-coordinator
|
||||
{ };
|
||||
|
||||
Reference in New Issue
Block a user