Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-05-20 12:07:23 +00:00
committed by GitHub
79 changed files with 465 additions and 3718 deletions
+3 -4
View File
@@ -16,7 +16,6 @@
roboto,
treefmt,
}:
stdenvNoCC.mkDerivation (
finalAttrs:
let
@@ -100,14 +99,14 @@ stdenvNoCC.mkDerivation (
dest="$out/share/doc/nixpkgs"
mkdir -p "$(dirname "$dest")"
mv out "$dest"
mv "$dest/index.html" "$dest/manual.html"
cp "$dest/index.html" "$dest/manual.html"
cp ${roboto.src}/web/Roboto\[ital\,wdth\,wght\].ttf "$dest/Roboto.ttf"
cp ${epub} "$dest/nixpkgs-manual.epub"
mkdir -p $out/nix-support/
echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products
runHook postInstall
@@ -126,7 +125,7 @@ stdenvNoCC.mkDerivation (
let
devmode' = devmode.override {
buildArgs = toString ../.;
open = "/share/doc/nixpkgs/manual.html";
open = "/share/doc/nixpkgs/index.html";
};
nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@";
in
+6
View File
@@ -13973,6 +13973,12 @@
github = "LogicalOverflow";
githubId = 5919957;
};
lheintzmann1 = {
email = "lheintzmann1@disroot.org";
github = "lheintzmann1";
githubId = 141759313;
name = "Lucas Heintzmann";
};
lhvwb = {
email = "nathaniel.baxter@gmail.com";
github = "nathanielbaxter";
+19 -7
View File
@@ -46,8 +46,12 @@ let
)
);
# Replace characters that are problematic in file names
# Replace prefixes and characters that are problematic in file names
cleanHelmChartName =
name:
let
woPrefix = lib.removePrefix "https://" (lib.removePrefix "oci://" name);
in
lib.replaceStrings
[
"/"
@@ -56,7 +60,8 @@ let
[
"-"
"-"
];
]
woPrefix;
# Fetch a Helm chart from a public registry. This only supports a basic Helm pull.
fetchHelm =
@@ -66,7 +71,12 @@ let
version,
hash ? lib.fakeHash,
}:
pkgs.runCommand (cleanHelmChartName "${lib.removePrefix "https://" repo}-${name}-${version}.tgz")
let
isOci = lib.hasPrefix "oci://" repo;
pullCmd = if isOci then repo else "--repo ${repo} ${name}";
name' = if isOci then "${repo}-${version}" else "${repo}-${name}-${version}";
in
pkgs.runCommand (cleanHelmChartName "${name'}.tgz")
{
inherit (lib.fetchers.normalizeHash { } { inherit hash; }) outputHash outputHashAlgo;
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
@@ -76,9 +86,7 @@ let
];
}
''
export HOME="$PWD"
helm repo add repository ${repo}
helm pull repository/${name} --version ${version}
helm pull ${pullCmd} --version ${version}
mv ./*.tgz $out
'';
@@ -724,7 +732,11 @@ in
};
};
};
nginx = {
repo = "oci://registry-1.docker.io/bitnamicharts/nginx";
version = "20.0.0";
hash = "sha256-sy+tzB+i9jIl/tqOMzzuhVhTU4EZVsoSBtPznxF/36c=";
};
custom-chart = {
package = ../charts/my-chart.tgz;
values = ../values/my-values.yaml;
@@ -13,6 +13,12 @@ in
services.prowlarr = {
enable = lib.mkEnableOption "Prowlarr, an indexer manager/proxy for Torrent trackers and Usenet indexers";
dataDir = lib.mkOption {
type = lib.types.str;
default = "/var/lib/prowlarr";
description = "The directory where Prowlarr stores its data files.";
};
package = lib.mkPackageOption pkgs "prowlarr" { };
openFirewall = lib.mkOption {
@@ -24,30 +30,63 @@ in
settings = servarr.mkServarrSettingsOptions "prowlarr" 9696;
environmentFiles = servarr.mkServarrEnvironmentFiles "prowlarr";
user = lib.mkOption {
type = lib.types.str;
default = "prowlarr";
description = ''
User account under which Prowlarr runs.
'';
};
group = lib.mkOption {
type = lib.types.str;
default = "prowlarr";
description = ''
Group under which Prowlarr runs.
'';
};
};
};
config = lib.mkIf cfg.enable {
systemd.services.prowlarr = {
description = "Prowlarr";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = servarr.mkServarrSettingsEnvVars "PROWLARR" cfg.settings // {
HOME = "/var/empty";
systemd = {
services.prowlarr = {
description = "Prowlarr";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = servarr.mkServarrSettingsEnvVars "PROWLARR" cfg.settings;
serviceConfig = {
Type = "simple";
User = cfg.user;
Group = cfg.group;
EnvironmentFile = cfg.environmentFiles;
ExecStart = "${lib.getExe cfg.package} -nobrowser -data='${cfg.dataDir}'";
Restart = "on-failure";
};
};
serviceConfig = {
Type = "simple";
DynamicUser = true;
StateDirectory = "prowlarr";
EnvironmentFile = cfg.environmentFiles;
ExecStart = "${lib.getExe cfg.package} -nobrowser -data=/var/lib/prowlarr";
Restart = "on-failure";
tmpfiles.settings."10-prowlarr".${cfg.dataDir}.d = {
inherit (cfg) user group;
mode = "0700";
};
};
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.settings.server.port ];
};
users.users = lib.mkIf (cfg.user == "prowlarr") {
prowlarr = {
isSystemUser = true;
group = cfg.group;
home = cfg.dataDir;
};
};
users.groups = lib.mkIf (cfg.group == "prowlarr") {
prowlarr = { };
};
};
}
+4 -2
View File
@@ -4,9 +4,11 @@
lib ? pkgs.lib,
}:
let
allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;
allK3s = lib.filterAttrs (
n: _: lib.strings.hasPrefix "k3s_" n && (builtins.tryEval pkgs.${n}).success
) pkgs;
in
{
lib.recurseIntoAttrs {
airgap-images = lib.mapAttrs (
_: k3s: import ./airgap-images.nix { inherit system pkgs k3s; }
) allK3s;
@@ -7,12 +7,12 @@
vimUtils,
}:
let
version = "0-unstable-2025-04-28";
version = "0-unstable-2025-05-13";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
rev = "197150cd3f30eeb1b3fd458339147533d91ac385";
hash = "sha256-ATW1QJ2aXHcUtGK6MNLSq4VkML3FLQphVcLqfzoX9PI=";
rev = "72f56f7585903cd7bf92c665351aa585e150af0f";
hash = "sha256-WPEizIClDmseDEhomCasLx/zfAMT7lq7ZBnfc/a8CuA=";
};
spectre_oxi = rustPlatform.buildRustPackage {
@@ -1587,8 +1587,8 @@ let
# semver scheme, contrary to preview versions which are listed on
# the VSCode Marketplace and use a calver scheme. We should avoid
# using preview versions, because they expire after two weeks.
version = "17.0.3";
hash = "sha256-jU1N5tJ4V3jzSNW9oE8AH5PRhTmsiIGnu65+IH5NxO0=";
version = "17.1.0";
hash = "sha256-WPSMf1yLXSDqImpMTxn1eXcSrimVSVjjaXDzFMQ/l0E=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
@@ -2514,8 +2514,8 @@ let
mktplcRef = {
name = "Ionide-fsharp";
publisher = "Ionide";
version = "7.25.8";
hash = "sha256-/pnLLFj6Iwn14GLGbuc2Ex7IbNmXFiH1Btd12cCGGes=";
version = "7.25.10";
hash = "sha256-2d12itLc9qBZZ7nQNS/80K46dde2RUKpkWgPwFxogIs=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";
@@ -4824,6 +4824,8 @@ let
tekumara.typos-vscode = callPackage ./tekumara.typos-vscode { };
teros-technology.teroshdl = callPackage ./teros-technology-teroshdl { };
theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "language-pascal";
@@ -0,0 +1,22 @@
{
lib,
vscode-utils,
}:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "teroshdl";
publisher = "teros-technology";
version = "7.0.3";
hash = "sha256-Bt31ia0X4sQQfREq8PPVEGt/oGe/Oob0yQbYkwNRSsk=";
};
meta = {
changelog = "https://github.com/TerosTechnology/vscode-terosHDL/releases";
description = "Visual Studio Code extension for HDL developments (SystemVerilog/Verilog/VHDL)";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=teros-technology.teroshdl";
homepage = "https://github.com/TerosTechnology/vscode-terosHDL";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ lheintzmann1 ];
};
}
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mame2003-plus";
version = "0-unstable-2025-05-08";
version = "0-unstable-2025-05-16";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2003-plus-libretro";
rev = "d3e54870080f9389b4b3e6c6f717bfa29a2fd7fe";
hash = "sha256-k3YLCP9FNBu5rD+T5bM+hJr1XNbUlXm8a96VRcj7PFw=";
rev = "c478eae7484b76aaacc76659dd4d7b8e1163bc87";
hash = "sha256-l7GwSj7/A/1ZAAqWz1GtMDCl6F45GJqucDBD89yqcsU=";
};
makefile = "Makefile";
@@ -13,13 +13,13 @@
}:
mkLibretroCore {
core = "ppsspp";
version = "0-unstable-2025-05-08";
version = "0-unstable-2025-05-19";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "732d05c2c136856a3f173574233a2431a015a6f5";
hash = "sha256-5PVN8qG0ONsro6jH/8rAIma+4DlKAUoS/6aUPqBqbe4=";
rev = "48852ed81dbfb4b502a45eb632d4f999a892cc72";
hash = "sha256-XgYu36byAxXTDsgq4Iz+VPWQNsPxXQP+hx+/MYZkm6k=";
fetchSubmodules = true;
};
@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "vice-${type}";
version = "0-unstable-2025-05-08";
version = "0-unstable-2025-05-16";
src = fetchFromGitHub {
owner = "libretro";
repo = "vice-libretro";
rev = "5f094cfb57d1f656027a9d26bda681b6ecc46419";
hash = "sha256-XqWAh3e2Q/i7c8nxqDP+sJHGdYWCyqdk2pwJ+JPsdVk=";
rev = "86bcfa8c4839236f70e31c656d220c074ff1dfb0";
hash = "sha256-Dw+dY1IsR5cIzXa61bWO+2GhrYqgC2ASMjxQe2MVeco=";
};
makefile = "Makefile";
@@ -41,6 +41,7 @@ lib:
ethtool,
fetchFromGitHub,
fetchgit,
fetchpatch,
fetchurl,
fetchzip,
findutils,
@@ -69,7 +70,7 @@ lib:
sqlite,
stdenv,
systemd,
util-linux,
util-linuxMinimal,
yq-go,
zstd,
}:
@@ -331,6 +332,17 @@ let
ldflags = versionldflags;
}).overrideAttrs
overrideContainerdAttrs;
# TODO (#405952): remove this patch. We had to add it to avoid a mass rebuild
# for the 25.05 release. Once the above PR is merged, switch back to plain util-linuxMinimal.
k3sUtilLinux = util-linuxMinimal.overrideAttrs (prev: {
patches =
prev.patches or [ ]
++ lib.singleton (fetchpatch {
url = "https://github.com/util-linux/util-linux/commit/7dbfe31a83f45d5aef2b508697e9511c569ffbc8.patch";
hash = "sha256-bJqpZiPli5Pm/XpDA445Ab5jesXrlcnaO6e4V0B3rSw=";
});
});
in
buildGoModule rec {
pname = "k3s";
@@ -377,7 +389,7 @@ buildGoModule rec {
ipset
bridge-utils
ethtool
util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
k3sUtilLinux # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
conntrack-tools
runc
bash
@@ -9,7 +9,7 @@
}:
buildPythonApplication rec {
version = "1.3.0";
version = "1.4.0";
pname = "podman-compose";
pyproject = true;
@@ -17,7 +17,7 @@ buildPythonApplication rec {
repo = "podman-compose";
owner = "containers";
tag = "v${version}";
hash = "sha256-0k+vJwWYEXQ6zxkcvjxBv9cq8nIBS15F7ul5VwqYtys=";
hash = "sha256-779L8fc5rxnkW5f4i/zgc8K9bEwKNKjw20cNlSwU/aA=";
};
build-system = [
+1
View File
@@ -392,6 +392,7 @@ rec {
postMount = ''
echo "Packing raw image..."
mkdir -p $out
tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
'';
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "amd-libflame";
version = "5.0";
version = "5.1";
src = fetchFromGitHub {
owner = "amd";
repo = "libflame";
rev = version;
hash = "sha256-Shsv5Zd59FN5tq1LY7QqPRtAHEysHIVbPeKIIZ/2eMw=";
hash = "sha256-9Z0e6RCJfqQlq3oT4fBu8rwPH1OWEKQ52rVDa0Y0rJU=";
};
postPatch = ''
+2
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
pkg-config,
@@ -36,5 +37,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "ares";
broken = stdenv.isDarwin;
};
}
+2 -2
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "14.4.1";
version = "14.4.2";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
hash = "sha256-Js4nK/3IJGwnjm+M+lN3eh77FO8ZbogIL+4F2hpGNJE=";
hash = "sha256-bf3c+9kecGedfBHpSlljp+/aAC/sNR5vSHWsjiRcURc=";
};
nativeBuildInputs = [ cmake ];
+3
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
fetchFromGitHub,
gitUpdater,
rustPlatform,
@@ -18,6 +19,7 @@ rustPlatform.buildRustPackage rec {
};
useFetchCargoVendor = true;
cargoHash = "sha256-lPE/mx4LzSOG1YjGol1f77oox4voZzp9RqrKYZAMoX0=";
nativeInstallCheckInputs = [ versionCheckHook ];
@@ -43,5 +45,6 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "arp-scan";
broken = stdenv.isDarwin;
};
}
+2
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
@@ -37,5 +38,6 @@ buildGoModule rec {
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "azurehound";
broken = stdenv.hostPlatform.isDarwin;
};
}
+3 -3
View File
@@ -18,19 +18,19 @@
rustPlatform.buildRustPackage rec {
pname = "cinny-desktop";
# We have to be using the same version as cinny-web or this isn't going to work.
version = "4.6.0";
version = "4.7.0";
src = fetchFromGitHub {
owner = "cinnyapp";
repo = "cinny-desktop";
tag = "v${version}";
hash = "sha256-tSZ7qSEoLNUnMICT1oVccMY9J6uVZu8QJGJA9NK8JwU=";
hash = "sha256-ls0ZxXiIrjyLL0MoxOTU/RK0k323nUiQfxtlwsEL45U=";
};
sourceRoot = "${src.name}/src-tauri";
useFetchCargoVendor = true;
cargoHash = "sha256-5rIbVYxSsjv+MvmZxviMhcfYN+jOFndvZa7PDO5DLn8=";
cargoHash = "sha256-NSzGB6o6BBoak2gbSOu8ucWA+R+behuTxeMnKpyA7no=";
postPatch =
let
+3 -3
View File
@@ -13,16 +13,16 @@
buildNpmPackage rec {
pname = "cinny-unwrapped";
version = "4.6.0";
version = "4.7.0";
src = fetchFromGitHub {
owner = "cinnyapp";
repo = "cinny";
rev = "v${version}";
hash = "sha256-MyVKRWhLXxz4h2/2OtpmYrLYiZeNOMEetHwl4NklkOA=";
hash = "sha256-x4cRZ0XfyvRqOWIqtsVBiIPDxC3J9SUdoReiWNUB/X8=";
};
npmDepsHash = "sha256-WNK1ke5NEbt2Gb92hEItnwu65rI/5VsbZDfTSp6aKvg=";
npmDepsHash = "sha256-s8dKMGwg6DL+aEq0Sk04VF1pSDpAW18Dok113xDWb8Q=";
nativeBuildInputs = [
python3
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "clickhouse-backup";
version = "2.6.16";
version = "2.6.18";
src = fetchFromGitHub {
owner = "Altinity";
repo = "clickhouse-backup";
rev = "v${version}";
hash = "sha256-3RckJDhMtmK/Yusad1McFee/ECYomAwxY+WlimkPPCs=";
hash = "sha256-NB3X/lwLsq6C+jZ7Tfq2HbMcqpNiD2bpoJcwXCKdsfw=";
};
vendorHash = "sha256-tgDNKujpmDk6wcP9jEwfSbRWzJqiPs7aAWkkaD195Ss=";
+1 -1
View File
@@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Replaces the connection between your device and the Internet with a modern, optimized, protocol";
homepage = "https://pkg.cloudflareclient.com/packages/cloudflare-warp";
homepage = "https://pkg.cloudflareclient.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
mainProgram = "warp-cli";
+5 -10
View File
@@ -1,6 +1,7 @@
{
bash,
buildNpmPackage,
coreutils,
fetchFromGitHub,
fetchpatch,
fetchurl,
@@ -13,7 +14,7 @@
}:
let
version = "2024.12.0";
version = "2025.3.0";
# nix version of install-onlyoffice.sh
# a later version could rebuild from sdkjs/web-apps as per
# https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh
@@ -83,10 +84,10 @@ buildNpmPackage {
owner = "cryptpad";
repo = "cryptpad";
rev = version;
hash = "sha256-oSrDajaCEc7I2AsDzKoO34ffd4OeXDwFDGm45yQDSvE=";
hash = "sha256-NxkVMsfLzdzifdn+f0C6mBJGd1oLwcMTAIXv+gBG7rI=";
};
npmDepsHash = "sha256-1EwxAe+8FOrngZx5+FEeu9uHKWZNBpsECEGrsyiZ2GU=";
npmDepsHash = "sha256-GWkyRlizPSA72WwoY+mRLwaMeD/SXdo6oUVwsd2gp7c=";
nativeBuildInputs = [
makeBinaryWrapper
@@ -99,12 +100,6 @@ buildNpmPackage {
# fix httpSafePort setting
# https://github.com/cryptpad/cryptpad/pull/1571
./0001-env.js-fix-httpSafePort-handling.patch
# https://github.com/cryptpad/cryptpad/pull/1740
(fetchpatch {
name = "Add `--check`, `--rdfind`, `--no-rdfind` options to `install-onlyoffice.sh`";
url = "https://github.com/cryptpad/cryptpad/commit/f38668735e777895db2eadd3413cff386fb12c0c.patch";
hash = "sha256-J4AK1XIa3q+/lD74p2c9O7jt0VEtofTmfAaQNU71sp8=";
})
];
# cryptpad build tries to write in cache dir
@@ -147,7 +142,7 @@ buildNpmPackage {
# directory.
makeWrapper "${lib.getExe nodejs}" "$out/bin/cryptpad" \
--add-flags "$out_cryptpad/server.js" \
--run "for d in customize.dist lib www; do ln -sf \"$out_cryptpad/\$d\" .; done" \
--run "for d in customize.dist lib www scripts; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \
--run "if ! [ -d customize ]; then \"${lib.getExe nodejs}\" \"$out_cryptpad/scripts/build.js\"; fi"
'';
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "ctre";
version = "3.9.0";
version = "3.10.0";
src = fetchFromGitHub {
owner = "hanickadot";
repo = "compile-time-regular-expressions";
rev = "v${version}";
hash = "sha256-Fmx8eKo4UHSYQa5RL70VmaogQj+ILVA1gfpaVE8+MlQ=";
hash = "sha256-/44oZi6j8+a1D6ZGZpoy82GHjPtqzOvuS7d3SPbH7fs=";
};
nativeBuildInputs = [ cmake ];
+7 -14
View File
@@ -1,8 +1,8 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
fetchpatch,
}:
buildGoModule rec {
@@ -11,27 +11,20 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "pwnesia";
repo = pname;
rev = "v${version}";
sha256 = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM=";
repo = "dnstake";
tag = "v${version}";
hash = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM=";
};
patches = [
# https://github.com/pwnesia/dnstake/pull/36
(fetchpatch {
name = "update-x-sys-fix-darwin.patch";
url = "https://github.com/pwnesia/dnstake/commit/974efbbff4ce26d2f2646ca2ceb1316c131cefbe.patch";
sha256 = "sha256-fLOGF8damdLROd8T0fH/FGSVX23dtc+yHhSvVCwVeuY=";
})
];
vendorHash = "sha256-lV6dUl+OMUQfhlgNL38k0Re1Mr3VP9b8SI3vTJ8CP18=";
meta = with lib; {
description = "Tool to check missing hosted DNS zones";
homepage = "https://github.com/pwnesia/dnstake";
license = with licenses; [ mit ];
changelog = "https://github.com/pwnesia/dnstake/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "dnstake";
broken = stdenv.hostPlatform.isDarwin;
};
}
+6 -8
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
python3,
fetchFromGitHub,
}:
@@ -22,11 +23,9 @@ python3.pkgs.buildPythonApplication rec {
"pyasn1"
];
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
build-system = with python3.pkgs; [ poetry-core ];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
cryptography
impacket
lnkparse3
@@ -38,16 +37,15 @@ python3.pkgs.buildPythonApplication rec {
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"donpapi"
];
pythonImportsCheck = [ "donpapi" ];
meta = with lib; {
description = "Tool for dumping DPAPI credentials remotely";
homepage = "https://github.com/login-securite/DonPAPI";
changelog = "https://github.com/login-securite/DonPAPI/releases/tag/V${version}";
changelog = "https://github.com/login-securite/DonPAPI/releases/tag/V${src.tag}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "donpapi";
broken = stdenv.hostPlatform.isDarwin;
};
}
+3 -3
View File
@@ -12,7 +12,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ente-web";
version = "1.0.4";
version = "1.0.10";
src = fetchFromGitHub {
owner = "ente-io";
@@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
sparseCheckout = [ "web" ];
tag = "photos-v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-M1kAZgqjbWNn6LqymtWRmAk/v0vWEGbyS50lVrsr85o=";
hash = "sha256-WJz1Weh17DWH5qzMry1uacHBXY9ouIXWRzoiwzIsN0I=";
};
sourceRoot = "${finalAttrs.src.name}/web";
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/web/yarn.lock";
hash = "sha256-EYhYwy6+7bgWckU/7SfL1PREWw9JUgKxWadSVtoZwXs=";
hash = "sha256-9LC5WuS1CBj3vBacXUxJXyPgvZ/zfcihjZpCiH/8Aa0=";
};
nativeBuildInputs = [
+2 -9
View File
@@ -14,7 +14,6 @@
docbook-xsl-nons,
docbook_xml_dtd_45,
fetchurl,
fetchpatch,
fuse3,
gdk-pixbuf,
gettext,
@@ -81,7 +80,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flatpak";
version = "1.16.0";
version = "1.16.1";
# TODO: split out lib once we figure out what to do with triggerdir
outputs =
@@ -100,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
hash = "sha256-ywrFZa3LYhJ8bRHtUO5wRNaoNvppw1Sy9LZAoiv6Syo=";
hash = "sha256-K0fo8tkNNdKTOe144abquzbu+pz6WlyjsNHydQLENnU=";
};
patches =
@@ -121,12 +120,6 @@ stdenv.mkDerivation (finalAttrs: {
# The icon validator needs to access the gdk-pixbuf loaders in the Nix store
# and cannot bind FHS paths since those are not available on NixOS.
finalAttrs.passthru.icon-validator-patch
(fetchpatch {
name = "static.patch";
url = "https://github.com/flatpak/flatpak/commit/114c22e814fc28243585915321b8e943471c377f.patch";
hash = "sha256-3JLzG74myBTssXQau0Ei5rpthy93Va7xb2MHRnJ3kaI=";
})
]
++ lib.optionals finalAttrs.doCheck [
# Hardcode paths used by tests and change test runtime generation to use files from Nix store.
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "free42";
version = "3.2.8";
version = "3.3.4";
src = fetchFromGitHub {
owner = "thomasokken";
repo = "free42";
tag = "v${finalAttrs.version}";
hash = "sha256-Hvq5YoiBVgKjz/+SVeF5WTj7CUZ7MrrFIAeesH3we68=";
hash = "sha256-4EEk11/a9kie1sXO1lpJ7GGqjQ2Wvcvg7uhlD6RzyP0=";
};
nativeBuildInputs = [
+8 -5
View File
@@ -6,20 +6,22 @@
python3.pkgs.buildPythonApplication rec {
pname = "ghunt";
version = "2.1.0";
version = "2.3.3";
pyproject = true;
src = fetchFromGitHub {
owner = "mxrch";
repo = "ghunt";
tag = "v${version}";
hash = "sha256-UeHVATTyAH3Xdm/NVSUhiicM+tZ4UnLeJsy1jSLK3v8=";
# The newer releases aren't git-tagged to we just take the
# commit with the version bump
rev = "5782248bfd92a24875e112ed0a83e6986d4c70d0";
hash = "sha256-SQk/hy4r9LIffsu3kxLTv5LCcEvcZkP2jhmPA6Fzo8U=";
};
pythonRelaxDeps = true;
nativeBuildInputs = with python3.pkgs; [
setuptools
poetry-core
];
propagatedBuildInputs =
@@ -29,6 +31,7 @@ python3.pkgs.buildPythonApplication rec {
autoslot
beautifulsoup4
beautifultable
dnspython
geopy
httpx
humanize
@@ -39,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
protobuf
python-dateutil
rich
trio
rich-argparse
packaging
]
++ httpx.optional-dependencies.http2;
+5 -4
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "goimapnotify";
version = "2.4";
version = "2.5";
src = fetchFromGitLab {
owner = "shackra";
repo = "goimapnotify";
rev = version;
hash = "sha256-ieaj97CjoSc/qt/JebATHmiJ7RIvNUpFZjEM6mqG9Rk=";
tag = version;
hash = "sha256-RHTOieuw4ZeM1hKHUobMIzAKQ2ZgqIaJMoemF6JY8Vg=";
};
vendorHash = "sha256-rWPXQj0XFS/Mv9ylGv09vol0kkRDNaOAEgnJvSWMvoI=";
vendorHash = "sha256-5cZzaCoOR1R7iST0q3GaJbYIbKKEigeWqhp87maOL04=";
postPatch = ''
for f in command.go command_test.go; do
@@ -27,6 +27,7 @@ buildGoModule rec {
meta = with lib; {
description = "Execute scripts on IMAP mailbox changes (new/deleted/updated messages) using IDLE";
homepage = "https://gitlab.com/shackra/goimapnotify";
changelog = "https://gitlab.com/shackra/goimapnotify/-/blob/${src.tag}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
wohanley
+3 -3
View File
@@ -8,16 +8,16 @@
buildGo124Module rec {
pname = "gowebly";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "gowebly";
repo = "gowebly";
tag = "v${version}";
hash = "sha256-QsU5Brzs3FeFkQPmpXwehP1G6MocHtCZ9uhw1lFtOEU=";
hash = "sha256-iCdChT/eAWfeZyl5W1UHIjET3MGUD1YakjTToSS7iGs=";
};
vendorHash = "sha256-wOpenKh+4v0gRY0Zvx3URi4D1jXSrIONcrlzyjJUaSg=";
vendorHash = "sha256-mFCNrcdwSExjVym4BN1Yb/lsfQHxCDrlWoa9vyQ74ko=";
env.CGO_ENABLED = 0;
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "heliocron";
version = "0.8.1";
version = "1.0.0";
src = fetchFromGitHub {
owner = "mfreeborn";
repo = "heliocron";
rev = "v${version}";
hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk=";
hash = "sha256-tqwVYIU8RXb1hiKnP7AlkxHsMhbAlwSmPGyFFMHIbAo=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-as1rMyLqK0Z+UrO6B7Fzn2nNQM0xRrLoEPd2WlANxe8=";
cargoHash = "sha256-rQriNb/njEUBUmCUy5NKEfOYkOLy9i7ClU0vR72udOo=";
meta = {
description = "Execute tasks relative to sunset, sunrise and other solar events";
+3 -3
View File
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = "Iosevka${toString set}";
version = "33.2.2";
version = "33.2.3";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
hash = "sha256-dhMTcceHru/uLHRY4eWzFV+73ckCBBnDlizP3iY5w5w=";
hash = "sha256-dCHJYGZYTvjDtM2V+NdwXNxHg4kkcVAQD0G3DPtu5ps=";
};
npmDepsHash = "sha256-5DcMV9N16pyQxRaK6RCoeghZqAvM5EY1jftceT/bP+o=";
npmDepsHash = "sha256-eqWf5d9uCMkvDNPlICUt7QVT+2WsU0u+TE14ZraWXXE=";
nativeBuildInputs =
[
+5 -4
View File
@@ -37,12 +37,13 @@ stdenv.mkDerivation {
readline
];
postPatch = ''
cp ${iana-enterprise-numbers} enterprise-numbers
'';
configureFlags = [ "--disable-registry-download" ];
postInstall = ''
# Install to path reported in configure as "Set IANA PEN dictionary search path to ..."
install -Dm444 ${iana-enterprise-numbers} $out/share/misc/enterprise-numbers
'';
meta = {
description = "Command-line interface to IPMI-enabled devices";
mainProgram = "ipmitool";
+7 -6
View File
@@ -6,22 +6,23 @@
buildGoModule rec {
pname = "irccat";
version = "0.4.8";
version = "0.4.12";
src = fetchFromGitHub {
owner = "irccloud";
repo = "irccat";
rev = "v${version}";
hash = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts=";
hash = "sha256-W6Qj+zg6jC304bEIQeFB8unSFgjV60zXV+I8hpw3AFA=";
};
vendorHash = "sha256-IRXyM000ZDiLPHX20lXlx00tkCzBe5PqvdgXAvm0EAw=";
vendorHash = "sha256-SUE868jVJywqE0A5yjMWohrMw58OUnxGGxvcR8UzPfE=";
meta = with lib; {
meta = {
homepage = "https://github.com/irccloud/irccat";
changelog = "https://github.com/irccloud/irccat/releases/tag/v${version}0.4.11";
description = "Send events to IRC channels from scripts and other applications";
mainProgram = "irccat";
maintainers = with maintainers; [ qyliss ];
license = licenses.gpl3Only;
maintainers = with lib.maintainers; [ qyliss ];
license = lib.licenses.gpl3Only;
};
}
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "libcerf";
version = "2.4";
version = "3.0";
src = fetchurl {
url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz";
sha256 = "sha256-CAswrlZMPavjuJJkUira9WR+x1QCFXK+5UkpaXsnbNw=";
sha256 = "sha256-xhCPvaia839YgRnAxUK2wegkhFo2vqL6MfftLMGiRts=";
};
nativeBuildInputs = [
+6 -3
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
}:
@@ -11,8 +12,8 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "librespeed";
repo = "speedtest-cli";
rev = "v${version}";
sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8=";
tag = "v${version}";
hash = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8=";
};
vendorHash = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ=";
@@ -23,8 +24,10 @@ buildGoModule rec {
meta = with lib; {
description = "Command line client for LibreSpeed";
homepage = "https://github.com/librespeed/speedtest-cli";
license = with licenses; [ lgpl3Only ];
changelog = "https://github.com/librespeed/speedtest-cli/releases/tag/${src.tag}";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "speedtest-cli";
broken = stdenv.hostPlatform.isDarwin;
};
}
+9 -9
View File
@@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "maigret";
version = "0.4.4";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "soxoj";
repo = pname;
repo = "maigret";
tag = "v${version}";
hash = "sha256-Z8SnA7Z5+oKW0AOaNf+c/zR30lrPFmXaxxKkbnDXNNs=";
};
@@ -27,7 +27,9 @@ python3.pkgs.buildPythonApplication rec {
})
];
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
aiodns
aiohttp
aiohttp-socks
@@ -68,8 +70,6 @@ python3.pkgs.buildPythonApplication rec {
yarl
];
__darwinAllowLocalNetworking = true;
nativeCheckInputs = with python3.pkgs; [
pytest-httpserver
pytest-asyncio
@@ -77,6 +77,7 @@ python3.pkgs.buildPythonApplication rec {
];
pythonRelaxDeps = true;
pythonRemoveDeps = [ "future-annotations" ];
pytestFlagsArray = [
@@ -100,14 +101,13 @@ python3.pkgs.buildPythonApplication rec {
"test_asyncio_progressbar_executor"
];
pythonImportsCheck = [
"maigret"
];
pythonImportsCheck = [ "maigret" ];
meta = with lib; {
description = "Tool to collect details about an username";
homepage = "https://maigret.readthedocs.io";
license = with licenses; [ mit ];
license = licenses.mit;
maintainers = with maintainers; [ fab ];
broken = stdenv.hostPlatform.isDarwin;
};
}
+2 -2
View File
@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "mu";
version = "1.12.9";
version = "1.12.11";
outputs = [
"out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "djcb";
repo = "mu";
rev = "v${version}";
hash = "sha256-o6K1xHv6dvzv1oRRiAiSXAqTaC0GcPDQ+ymh5kmH98k=";
hash = "sha256-t4Jv1RX1mMGwiYg9mFrRuO2j54EfaGM3ouOdg8upds8=";
};
postPatch = ''
+4 -2
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
}:
@@ -24,10 +25,11 @@ buildGoModule rec {
meta = with lib; {
description = "Tool to work with DNS MX records";
mainProgram = "mx-takeover";
homepage = "https://github.com/musana/mx-takeover";
changelog = "https://github.com/musana/mx-takeover/releases/tag/v${version}";
changelog = "https://github.com/musana/mx-takeover/releases/tag/v${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "mx-takeover";
broken = stdenv.hostPlatform.isDarwin;
};
}
+45
View File
@@ -0,0 +1,45 @@
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
pname = "newt";
version = "1.1.3";
src = fetchFromGitHub {
owner = "fosrl";
repo = "newt";
tag = version;
hash = "sha256-wfm2UI4QUiYiAJIYBiSCOD/w72WRJIv2cyLIkfqGsek=";
};
vendorHash = "sha256-8VlT9cy2uNhQPiUpr1jJuQSgUR6TtlbQ+etran2Htxs=";
postPatch = ''
substituteInPlace main.go \
--replace-fail "replaceme" "${version}"
'';
nativeInstallCheckInputs = [ versionCheckHook ];
ldflags = [
"-s"
"-w"
];
doInstallCheck = true;
versionCheckProgramArg = [ "-version" ];
meta = {
description = "Tunneling client for Pangolin";
homepage = "https://github.com/fosrl/newt";
changelog = "https://github.com/fosrl/newt/releases/tag/${src.tag}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "newt";
};
}
+2 -2
View File
@@ -31,12 +31,12 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "nixos-anywhere";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixos-anywhere";
rev = finalAttrs.version;
hash = "sha256-DGJ52K2cN3MRUlI/knH0tipGja0Agfk+QVfIQL1gWT4=";
hash = "sha256-xzalz30m0iTVfxPMf0nROg5j/xvg6NhHsX04+ym1E9w=";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
@@ -1,22 +0,0 @@
From d6d43789bf5af99c9c18f4c88e6a6751bdcacbce Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Wed, 16 Apr 2025 15:18:02 +0100
Subject: [PATCH] Downgrade cabal-version for ghc 9.6 compat
---
oama.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oama.cabal b/oama.cabal
index 658c051..4d0c428 100644
--- a/oama.cabal
+++ b/oama.cabal
@@ -1,4 +1,4 @@
-cabal-version: 3.12
+cabal-version: 3.8
name: oama
version: 0.19.0
license: BSD-3-Clause
--
2.48.1
+3 -3
View File
@@ -31,11 +31,11 @@
}:
mkDerivation {
pname = "oama";
version = "0.19.0";
version = "0.20.1";
src = fetchgit {
url = "https://github.com/pdobsan/oama.git";
sha256 = "1nrgpnh76fcmkdw1j3ha5cam7bnxkgfns2plj8609qv0v0swmj4s";
rev = "3eef17b7e290dfced252375a13bc8dd46849adf0";
sha256 = "sha256-59tKAHL7rCZJyfraD7NnwFR5iP6784IcgH82hfsFHiA=";
rev = "99659a8567808b28885ed241abe4df03f37e92fc";
fetchSubmodules = true;
};
isLibrary = true;
+1 -3
View File
@@ -1,6 +1,5 @@
{
haskell,
haskellPackages,
lib,
stdenv,
}:
@@ -8,7 +7,6 @@ let
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
overrides = {
patches = [ ./0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch ];
description = "OAuth credential MAnager";
homepage = "https://github.com/pdobsan/oama";
maintainers = with lib.maintainers; [ aidalgol ];
@@ -16,7 +14,7 @@ let
passthru.updateScript = ./update.sh;
};
raw-pkg = haskellPackages.callPackage ./generated-package.nix { };
raw-pkg = haskell.packages.ghc912.callPackage ./generated-package.nix { };
in
lib.pipe raw-pkg [
(overrideCabal overrides)
+21 -8
View File
@@ -1,24 +1,26 @@
{
lib,
stdenv,
fetchFromGitHub,
buildGoModule,
installShellFiles,
versionCheckHook,
nix-update-script,
}:
let
mainProgram = "pinact";
in
buildGoModule (finalAttrs: {
pname = "pinact";
version = "3.1.2";
src = fetchFromGitHub {
owner = "suzuki-shunsuke";
repo = "pinact";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-5jJzlMMpfk9fFDoqR0NJNacquZ4Zma0YF/pi80Miv0Y=";
};
mainProgram = "pinact";
in
buildGoModule {
inherit pname version src;
vendorHash = "sha256-kK4r0mCktlbhJr6iHD0Q/k1DralieN2AUg+zREZ06DA=";
@@ -26,6 +28,17 @@ buildGoModule {
doCheck = true;
nativeBuildInputs = [
installShellFiles
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd '${mainProgram}' \
--bash <("$out/bin/${mainProgram}" completion bash) \
--zsh <("$out/bin/${mainProgram}" completion zsh) \
--fish <("$out/bin/${mainProgram}" completion fish)
'';
nativeInstallCheckInputs = [
versionCheckHook
];
@@ -40,7 +53,7 @@ buildGoModule {
ldflags = [
"-s"
"-w"
"-X main.version=${version} -X main.commit=v${version}"
"-X main.version=${finalAttrs.version} -X main.commit=v${finalAttrs.version}"
];
subPackages = [
@@ -51,8 +64,8 @@ buildGoModule {
inherit mainProgram;
description = "Pin GitHub Actions versions";
homepage = "https://github.com/suzuki-shunsuke/pinact";
changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${version}";
changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kachick ];
};
}
})
+3 -3
View File
@@ -14,17 +14,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pixi";
version = "0.46.0";
version = "0.47.0";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
tag = "v${finalAttrs.version}";
hash = "sha256-HkaDc7RauVhuuu4R88xlgiAM9pv6RPgyvaVoPO0PHqA=";
hash = "sha256-ndNwtCKAU/59bq6uDlaxb+24DG2yKD7NyfwgBAlHMtg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-0X+3/fQLgUSSnDVAociKqk4rJfKHJtKdXIIaSUzI18g=";
cargoHash = "sha256-Q82CD/byqXAqJpO0izIwBD6lYpoZNJoWqDCciRecZnY=";
nativeBuildInputs = [
pkg-config
+1
View File
@@ -40,5 +40,6 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
mainProgram = "poutine";
broken = stdenv.hostPlatform.isDarwin;
};
}
+3 -3
View File
@@ -16,14 +16,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ptyxis";
version = "47.10";
version = "48.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "chergert";
repo = "ptyxis";
rev = finalAttrs.version;
hash = "sha256-ZZwrqX7GkqMVtLhyzJvThzqmxg/PRwBxSshSv/Z7uKo=";
tag = finalAttrs.version;
hash = "sha256-Uj3RUMaPU/KHhhtsrw+kD5HBM+UY4MY/Ov4/8wjNpyI=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,11 +7,11 @@
renode.overrideAttrs (
finalAttrs: _: {
pname = "renode-unstable";
version = "1.15.3+20250406gitea53e3840";
version = "1.15.3+20250507git91a4bb342";
src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
hash = "sha256-bhuhMSogZUuUQrSVw9MAt8L89OoT67QRuZ9AG2ZTAKI=";
hash = "sha256-x0g7wsaDCi3QUTEQcw/gGtzkWTmJB7ZZVqCE9fOyCFI=";
};
passthru.updateScript =
+13 -9
View File
@@ -6,25 +6,31 @@
python3.pkgs.buildPythonApplication rec {
pname = "routersploit";
version = "unstable-2021-02-06";
format = "setuptools";
version = "3.4.1-unstable-2025-04-24";
pyproject = true;
src = fetchFromGitHub {
owner = "threat9";
repo = pname;
rev = "3fd394637f5566c4cf6369eecae08c4d27f93cda";
repo = "routersploit";
rev = "0bf837f67ed2131077c4192c21909104aab9f13d";
hash = "sha256-IET0vL0VVP9ZNn75hKdTCiEmOZRHHYICykhzW2g3LEg=";
};
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
future
paramiko
pycryptodome
pysnmp
requests
setuptools
standard-telnetlib
];
# Tests are out-dated and support for newer pysnmp is not implemented yet
doCheck = false;
nativeCheckInputs = with python3.pkgs; [
pytest-xdist
pytestCheckHook
@@ -35,9 +41,7 @@ python3.pkgs.buildPythonApplication rec {
mv $out/bin/rsf.py $out/bin/rsf
'';
pythonImportsCheck = [
"routersploit"
];
pythonImportsCheck = [ "routersploit" ];
pytestFlagsArray = [
# Run the same tests as upstream does in the first round
@@ -49,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Exploitation Framework for Embedded Devices";
homepage = "https://github.com/threat9/routersploit";
license = with licenses; [ bsd3 ];
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
mainProgram = "rsf";
};
+3 -3
View File
@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage rec {
pname = "satty";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "gabm";
repo = "Satty";
rev = "v${version}";
hash = "sha256-qsehxmx+iQKG70Es2I+G8hs4G56e/PuPPenNeEQ4sGQ=";
hash = "sha256-IqXzY4mccwVgRaq1TLr1dSyqSbIvClDyF6ahA6f5UP8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-VQ8BwEeDM9Dll6GIwXH2wHWwRKJxk3gTrxZ95pFaH4c=";
cargoHash = "sha256-xfRuEq7YgyYD9IvEzVAor/Iz4LUBUawDREXtqerDn6A=";
nativeBuildInputs = [
copyDesktopItems
+4 -8
View File
@@ -17,23 +17,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "share-preview";
version = "0.5.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "rafaelmardojai";
repo = "share-preview";
rev = finalAttrs.version;
hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E=";
hash = "sha256-6Pk+3o4ZWF5pDYAtcBgty4b7edzIZnIuJh0KW1VW33I=";
};
patches = [
./wasm-bindgen.patch
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src patches;
inherit (finalAttrs) src;
name = "share-preview-${finalAttrs.version}";
hash = "sha256-lDSRXe+AjJzWT0hda/aev6kNJAvHblGmmAYXdYhrnQs=";
hash = "sha256-MC5MsoFdeCvF9nIFoYCKoBBpgGysBH36OdmTqbIJt8s=";
};
nativeBuildInputs = [
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -25,14 +25,14 @@
clangStdenv.mkDerivation rec {
pname = "sogo";
version = "5.11.2";
version = "5.12.1";
# always update the sope package as well, when updating sogo
src = fetchFromGitHub {
owner = "Alinto";
repo = "sogo";
rev = "SOGo-${version}";
hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0=";
hash = "sha256-BBFo8h0YnE/qHbAwu+vHX+eu9f4WXMs1gQT2nAxiPgc=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -24,13 +24,13 @@ let
in
buildPythonApplication rec {
pname = "sonata";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "multani";
repo = "sonata";
rev = "v${version}";
sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x";
tag = "v${version}";
sha256 = "sha256-80F2dVaRawnI0E+GzaxRUudaLWWHGUjICCEbXHVGy+E=";
};
disabled = !isPy3k;
+2 -2
View File
@@ -14,13 +14,13 @@
clangStdenv.mkDerivation rec {
pname = "sope";
version = "5.11.2";
version = "5.12.1";
src = fetchFromGitHub {
owner = "Alinto";
repo = "sope";
rev = "SOPE-${version}";
hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag=";
hash = "sha256-a7uOFiPnZ++ACV1Ggwh+YtP+NQYS4datQdlPtG+qlg0=";
};
buildInputs =
+1
View File
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
platforms = platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
};
}
+3 -3
View File
@@ -18,17 +18,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uv";
version = "0.7.5";
version = "0.7.6";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = finalAttrs.version;
hash = "sha256-sE0d18lA9pA/EpzwXZ8RSucQ5eVtnkyoTzkrB5sAaO4=";
hash = "sha256-zFVVvPPb1UM71u9QFphp9YFWgmvYemAHouCttNnQWMk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-xrusRs2PEEHzEOTvJ8vcpn/uxbeW5APcFbJZNZPzs1U=";
cargoHash = "sha256-aeOT6HO12J700CF7o2LiqUy6pl0Fzb0OLxHt+G4HW/k=";
buildInputs = [
rust-jemalloc-sys
+3 -3
View File
@@ -33,9 +33,9 @@ let
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
"20.1.4".officialRelease.sha256 = "sha256-/WomqG2DdnUHwlVsMfpzaK/dhGV3zychfU0wLmihQac=";
"21.0.0-git".gitRelease = {
rev = "5b91756c0ca7ef4d75c33c2617bfd0f9719907dc";
rev-version = "21.0.0-unstable-2025-05-11";
sha256 = "sha256-5e72pOZO2/hYY7/1Kt0ITtEjJzWwKR58ufCU/9EkdS0=";
rev = "3d0c616ce30cdc3d9c26dda8fdc608a6c85f00a6";
rev-version = "21.0.0-unstable-2025-05-18";
sha256 = "sha256-5tfGng/urJNSqlFy5sxIYsR5brtf2ZlL5tssGD6Oef8=";
};
} // llvmVersions;
+7 -6
View File
@@ -540,16 +540,17 @@ let
in
stdenv.mkDerivation (
{
name = "${name}${if version == null then "" else "-${version}"}";
name = name + lib.optionalString (version != null) "-${version}";
strictDeps = true;
buildInputs =
[
tarWrapper
python
nodejs
]
[ tarWrapper ]
++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
++ buildInputs;
propagatedNativeBuildInputs = [
nodejs
python
];
inherit nodejs;
@@ -285,9 +285,6 @@ let
"test_main_exit_calls_version_check"
# AssertionError: assert 2 == 1
"test_simple_send_non_retryable_error"
# Broken tests (Aider-AI/aider#3679)
"test_language_ocaml"
"test_language_ocaml_interface"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Tests fails on darwin
@@ -9,7 +9,6 @@
buildPythonPackage,
cleanlab,
datasets,
deprecated,
elasticsearch8,
evaluate,
factory-boy,
@@ -28,9 +27,10 @@
packaging,
pandas,
passlib,
setuptools,
pdm-backend,
peft,
pgmpy,
pillow,
plotly,
prodict,
psutil,
@@ -53,6 +53,7 @@
spacy-transformers,
spacy,
sqlalchemy,
standardwebhooks,
tqdm,
transformers,
typer,
@@ -67,16 +68,16 @@
buildPythonPackage rec {
pname = "argilla";
version = "2.6.0";
version = "2.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "argilla-io";
repo = "argilla";
tag = "v${version}";
hash = "sha256-2e2AIhrCJoPDn6EnO4IGSd2YNV/iSY39nmzbcHNwtOU=";
hash = "sha256-8j7/Gtn4FnAZA3oIV7dLxKwNtigqB7AweHtQ/kzLwm4=";
};
sourceRoot = "${src.name}/${pname}";
@@ -89,21 +90,23 @@ buildPythonPackage rec {
"wrapt"
];
build-system = [ setuptools ];
build-system = [ pdm-backend ];
dependencies = [
httpx
deprecated
datasets
packaging
pandas
pydantic
wrapt
numpy
tqdm
backoff
pillow
huggingface-hub
monotonic
rich
typer
standardwebhooks
];
optional-dependencies = {
@@ -112,6 +115,7 @@ buildPythonPackage rec {
aiofiles
aiosqlite
alembic
backoff
brotli-asgi
elasticsearch8
fastapi
@@ -142,11 +146,9 @@ buildPythonPackage rec {
];
integrations = [
cleanlab
datasets
evaluate
faiss
flyingsquid
huggingface-hub
openai
peft
pgmpy
@@ -39,5 +39,6 @@ buildPythonPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "pductl";
broken = versionAtLeast pysnmp.version "7";
};
}
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "iterfzf";
version = "1.6.0.60.3";
version = "1.8.0.62.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "dahlia";
repo = "iterfzf";
tag = version;
hash = "sha256-M6ri90GNHOmr0HtQ/tGxqpG7f+D5rsH/SAlbaVtmTwU=";
hash = "sha256-eLgF+9p+sqxWR1VkSoeL0NPDMamzUYbql4gMeG8fyNY=";
};
postPatch = ''
@@ -53,11 +53,12 @@ buildPythonPackage rec {
pythonImportsCheck = [ "iterfzf" ];
meta = with lib; {
meta = {
description = "Pythonic interface to fzf, a CLI fuzzy finder";
homepage = "https://github.com/dahlia/iterfzf";
changelog = "https://github.com/dahlia/iterfzf/releases/tag/${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
platforms = lib.platforms.unix;
};
}
@@ -31,14 +31,14 @@
buildPythonPackage rec {
pname = "langchain-openai";
version = "0.3.16";
version = "0.3.17";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-openai==${version}";
hash = "sha256-e8y5rL+OUFOAPfXTC+XHn/wVfsecPInsS8hBxm1USAw=";
hash = "sha256-JsPdG62vvM8b/u5bo6FyXQhhGua/Sd74L/8CtMI7Fjc=";
};
sourceRoot = "${src.name}/libs/partners/openai";
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "otpauth";
version = "2.2.0";
version = "2.2.1";
pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-Ev2uZNBmT/v6/a39weyP5XGs0OcaYveSM9072giNOcI=";
hash = "sha256-Fpp629cV/KaH9qZtAszb78Ip+0n4pjS5WNKG+QgTTVk=";
};
build-system = [ hatchling ];
@@ -30,7 +30,7 @@
let
pname = "pynitrokey";
version = "0.8.1";
version = "0.8.3";
mainProgram = "nitropy";
in
@@ -40,7 +40,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-HLqT4r0ljRU5TYRJuBJvt9tF0igxaerUEPobyzWLCO8=";
hash = "sha256-GPg034MhJLROSERWasZyvklckLICBI6XWMTLC++nX4g=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
cython,
fetchFromGitHub,
@@ -8,7 +9,6 @@
pythonOlder,
setuptools,
unittestCheckHook,
wheel,
}:
buildPythonPackage rec {
@@ -25,24 +25,22 @@ buildPythonPackage rec {
hash = "sha256-0FDhkIK8jy3/SFmCzrl9l4RTeIKDjO0o5UoODx6Wnfs=";
};
build-system = [
setuptools
wheel
];
build-system = [ setuptools ];
nativeBuildInputs = [
cython
pkg-config
];
buildInputs = [
libstatgrab
];
buildInputs = [ libstatgrab ];
nativeCheckInputs = [ unittestCheckHook ];
pythonImportsCheck = [ "statgrab" ];
# Tests don't work on darwin due to seg fault
doCheck = !stdenv.hostPlatform.isDarwin;
meta = with lib; {
description = "Python bindings for libstatgrab";
homepage = "https://github.com/libstatgrab/pystatgrab";
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pytest-scim2-server";
version = "0.1.3";
version = "0.1.5";
pyproject = true;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pytest_scim2_server";
inherit version;
hash = "sha256-iZrKKUfbqAAhugSNhqiCy6mVBoXxa0yruiQzHg0pIDY=";
hash = "sha256-5jsjVtxiSF3cu9useDEmwQ45PqJAZmfw7OUIZkCi6gQ=";
};
build-system = [ hatchling ];
@@ -2,6 +2,8 @@
lib,
buildPythonPackage,
fetchPypi,
python,
nix-update-script,
# build-system
cython,
@@ -17,7 +19,7 @@
buildPythonPackage rec {
pname = "tree-sitter-language-pack";
version = "0.6.1";
version = "0.7.3";
pyproject = true;
# Using the GitHub sources necessitates fetching the treesitter grammar parsers by using a vendored script:
@@ -26,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "tree_sitter_language_pack";
inherit version;
hash = "sha256-pGNfW2ubZCVi2QHk6qJfyClJ1mDIi5R1Pm1GfZY0Ark=";
hash = "sha256-SROctgfYE1LTOtGOV1IPwQV6AJlVyczO1WYHzBjmo/0=";
};
build-system = [
@@ -42,13 +44,41 @@ buildPythonPackage rec {
tree-sitter-yaml
];
prePatch = ''
# Remove the packaged bindings, which only work on Linux and prevent the build from succeeding
# https://github.com/Goldziher/tree-sitter-language-pack/issues/46
rm -rf tree_sitter_language_pack/bindings/*.so
'';
pythonImportsCheck = [
"tree_sitter_language_pack"
"tree_sitter_language_pack.bindings"
];
# No tests in the pypi archive
doCheck = false;
# No tests in the pypi archive, we add a test to check that all bindings can be imported
checkPhase = ''
runHook preCheck
cat <<EOF > test-import-bindings.py
import sys
import os
if (cwd := os.getcwd()) in sys.path:
# remove current working directory from sys.path, use PYTHONPATH instead
sys.path.remove(cwd)
from typing import get_args
from tree_sitter_language_pack import SupportedLanguage, get_binding
for lang in get_args(SupportedLanguage):
get_binding(lang)
EOF
${python.interpreter} test-import-bindings.py
runHook postCheck
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Comprehensive collection of tree-sitter languages";
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
hatchling,
@@ -25,12 +26,15 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
# Tests don't work on darwin
doCheck = !stdenv.hostPlatform.isDarwin;
pythonImportsCheck = [ "turrishw" ];
meta = {
description = "Python library and program for Turris hardware listing";
homepage = "https://github.com/turris-cz/turrishw";
changelog = "https://github.com/turris-cz/turrishw/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/turris-cz/turrishw/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "webexteamssdk";
version = "2.0.3";
version = "1.6.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,9 +22,13 @@ buildPythonPackage rec {
owner = "CiscoDevNet";
repo = "webexteamssdk";
tag = "v${version}";
hash = "sha256-E66LwqzNWYAxnB8y5t8JHH4oVVXvheO7tteHWqrRRt8=";
hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo=";
};
# opsdroid still depends on webexteamssdk but package was renamed
# to webexpythonsdk
passthru.skipBulkUpdate = true;
postPatch = ''
# Remove vendorized versioneer
rm versioneer.py
@@ -50,7 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module for Webex Teams APIs";
homepage = "https://github.com/CiscoDevNet/webexteamssdk";
changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/${src.tag}";
changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
@@ -71,7 +72,12 @@ buildPythonPackage rec {
# This has been updated on main, so we expect this clause to be removed upon the next update.
pythonRelaxDeps = [ "faster-whisper" ];
pythonImportsCheck = [ "whisperx" ];
# Import check fails due on `aarch64-linux` ONLY in the sandbox due to onnxruntime
# not finding its default logger, which then promptly segfaults.
# Simply run the import check on every other platform instead.
pythonImportsCheck = lib.optionals (
!(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux)
) [ "whisperx" ];
# No tests in repository
doCheck = false;
+4 -2
View File
@@ -4,16 +4,18 @@
fetchurl,
qtdeclarative,
qt5compat,
qttools,
}:
mkKdeDerivation rec {
pname = "kirigami-addons";
version = "1.7.0";
version = "1.8.0";
src = fetchurl {
url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz";
hash = "sha256-fYVJdRhc90DeSG2E8eLsPk6ttmrJ+4lyFMupq4zEkrE=";
hash = "sha256-USAIVeTyhVCfcbHPkjmjRQYx+Aj109CETroBAfW00es=";
};
extraNativeBuildInputs = [ (qttools.override { withClang = true; }) ];
extraBuildInputs = [ qtdeclarative ];
extraPropagatedBuildInputs = [ qt5compat ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ m4 ];
buildInputs = [ libtirpc ];
inherit (nvidia_x11) makeFlags;
makeFlags = nvidia_x11.makeFlags ++ [ "DATE=true" ];
installFlags = [ "PREFIX=$(out)" ];
+7 -11
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
python3,
fetchFromGitHub,
}:
@@ -22,9 +23,7 @@ python3.pkgs.buildPythonApplication rec {
"mmh3"
];
build-system = with python3.pkgs; [
poetry-core
];
build-system = with python3.pkgs; [ poetry-core ];
dependencies = with python3.pkgs; [
dotwiz
@@ -36,13 +35,7 @@ python3.pkgs.buildPythonApplication rec {
regex
];
pythonImportsCheck = [
"deepsecrets"
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
];
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
disabledTests = [
# assumes package is built in /app (docker?), and not /build/${src.name} (nix sandbox)
@@ -51,12 +44,15 @@ python3.pkgs.buildPythonApplication rec {
"test_basic_info"
];
pythonImportsCheck = [ "deepsecrets" ];
meta = {
description = "Secrets scanner that understands code";
mainProgram = "deepsecrets";
homepage = "https://github.com/avito-tech/deepsecrets";
changelog = "https://github.com/avito-tech/deepsecrets/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "deepsecrets";
broken = stdenv.hostPlatform.isDarwin;
};
}