Merge master into staging-next

This commit is contained in:
github-actions[bot] 2025-01-08 12:05:57 +00:00 committed by GitHub
commit 61462a4004
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
76 changed files with 682 additions and 466 deletions

View file

@ -221,3 +221,5 @@ adb9714bd909df283c66bbd641bd631ff50a4260
667d42c00d566e091e6b9a19b365099315d0e611
84d4f874c2bac9f3118cb6907d7113b3318dcb5e
# tmuxPlugins sha-to-sri.py script
516b1e74c358a9c4b06e5591f8c1a2897aad0c33

View file

@ -37,7 +37,10 @@ let
lib.attrNames (
lib.filterAttrs (
name: value:
# use tryEval to handle entries in aliases.nix
(builtins.tryEval (
isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname
)).value
) pkgs
);

View file

@ -57,7 +57,6 @@ sets are
* `pkgs.python313Packages`
* `pkgs.python314Packages`
* `pkgs.pypy27Packages`
* `pkgs.pypy39Packages`
* `pkgs.pypy310Packages`
and the aliases
@ -66,7 +65,7 @@ and the aliases
* `pkgs.python3Packages` pointing to `pkgs.python312Packages`
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
* `pkgs.pypy2Packages` pointing to `pkgs.pypy27Packages`
* `pkgs.pypy3Packages` pointing to `pkgs.pypy39Packages`
* `pkgs.pypy3Packages` pointing to `pkgs.pypy310Packages`
* `pkgs.pypyPackages` pointing to `pkgs.pypy2Packages`

View file

@ -2138,6 +2138,11 @@
name = "aszlig";
keys = [ { fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; } ];
};
atagen = {
name = "atagen";
github = "atagen";
githubId = 11548989;
};
atalii = {
email = "taliauster@gmail.com";
github = "atalii";

View file

@ -1,31 +1,33 @@
{ lib
, stdenv
, curl
, jq
, htmlq
, xorg
, alsa-lib
, freetype
, p7zip
, autoPatchelfHook
, writeShellScript
, zlib
, libjack2
, makeWrapper
, copyDesktopItems
, makeDesktopItem
, curl
, freetype
, htmlq
, jq
, libglvnd
, librsvg
, makeDesktopItem
, makeWrapper
, p7zip
, writeShellScript
}:
let
versionForFile = v: builtins.replaceStrings [ "." ] [ "" ] v;
archdirs =
if stdenv.hostPlatform.isx86_64 then ["x86-64bit" "amd64"]
else if stdenv.hostPlatform.isAarch64 then ["arm-64bit" "arm"]
else throw "unsupported platform";
mkPianoteq =
{ name
, mainProgram
, startupWMClass
, src
, version
, archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit"
, ...
}:
stdenv.mkDerivation rec {
@ -45,11 +47,10 @@ let
];
buildInputs = [
(lib.getLib stdenv.cc.cc)
xorg.libX11 # libX11.so.6
xorg.libXext # libXext.so.6
(lib.getLib stdenv.cc.cc) # libgcc_s.so.1, libstdc++.so.6
alsa-lib # libasound.so.2
freetype # libfreetype.so.6
libglvnd # libGL.so.1
];
desktopItems = [
@ -68,20 +69,7 @@ let
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv -t $out/bin Pianoteq*/${archdir}/*
for f in $out/bin/Pianoteq*; do
if [ -x "$f" ] && [ -f "$f" ]; then
wrapProgram "$f" --prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath (buildInputs ++ [
xorg.libXcursor
xorg.libXinerama
xorg.libXrandr
libjack2
zlib
])
}
fi
done
mv -t $out/bin ${builtins.concatStringsSep " " (builtins.map (dir: "Pianoteq*/${dir}/*") archdirs)}
install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg
for size in 16 22 32 48 64 128 256; do
dir=$out/share/icons/hicolor/"$size"x"$size"/apps
@ -217,59 +205,64 @@ let
'';
};
in
{
# TODO currently can't install more than one because `lame` clashes
stage-trial = mkPianoteq rec {
name = "stage-trial";
mainProgram = "Pianoteq 8 STAGE";
startupWMClass = "Pianoteq STAGE Trial";
version = "8.2.0";
src = fetchPianoteqTrial {
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
hash = "sha256-66xbcqNrnVJ+C9FQ8Bg8A7nj/bFrjt6jKheusrXVWvI=";
};
};
standard-trial = mkPianoteq rec {
name = "standard-trial";
mainProgram = "Pianoteq 8";
startupWMClass = "Pianoteq Trial";
version = "8.2.0";
src = fetchPianoteqTrial {
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
hash = "sha256-IFFQMn8EFo5X8sUZV2/vtQOA83NHEFrUsU++CvYbN1c=";
};
};
stage-6 = mkPianoteq rec {
name = "stage-6";
mainProgram = "Pianoteq 6 STAGE";
startupWMClass = "Pianoteq STAGE";
version = "6.7.3";
archdir = if (stdenv.hostPlatform.system == "aarch64-linux") then throw "Pianoteq stage-6 is not supported on aarch64-linux" else "amd64";
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
hash = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy";
};
};
stage-7 = mkPianoteq rec {
name = "stage-7";
mainProgram = "Pianoteq 7 STAGE";
startupWMClass = "Pianoteq STAGE";
version = "7.3.0";
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
hash = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx";
};
};
standard-8 = mkPianoteq rec {
name = "standard-8";
mainProgram = "Pianoteq 8";
version6 = "6.7.3";
version7 = "7.5.4";
version8 = "8.4.0";
mkStandard = version: hash: mkPianoteq {
name = "standard";
mainProgram = "Pianoteq ${lib.versions.major version}";
startupWMClass = "Pianoteq";
version = "8.2.0";
inherit version;
src = fetchPianoteqWithLogin {
name = "pianoteq_linux_v${versionForFile version}.7z";
hash = "sha256-ME0urUc1jwUKpg+5BdawYo9WhvMsrztYTVOrJTVxtkY=";
inherit hash;
};
};
# TODO other paid binaries, I don't own that so I don't know their hash.
mkStage = version: hash: mkPianoteq {
name = "stage";
mainProgram = "Pianoteq ${lib.versions.major version} STAGE";
startupWMClass = "Pianoteq STAGE";
inherit version;
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
inherit hash;
};
};
mkStandardTrial = version: hash: mkPianoteq {
name = "standard-trial";
mainProgram = "Pianoteq ${lib.versions.major version}";
startupWMClass = "Pianoteq Trial";
inherit version;
src = fetchPianoteqTrial {
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
inherit hash;
};
};
mkStageTrial = version: hash: mkPianoteq {
name = "stage-trial";
mainProgram = "Pianoteq ${lib.versions.major version} STAGE";
startupWMClass = "Pianoteq STAGE Trial";
inherit version;
src = fetchPianoteqTrial {
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
inherit hash;
};
};
in
{
standard_8 = mkStandard version8 "sha256-ZDGB/SOOz+sWz7P+sNzyaipEH452n8zq5LleO3ztSXc=";
stage_8 = mkStage version8 "";
standard-trial_8 = mkStandardTrial version8 "sha256-K3LbAWxciXt9hVAyRayxSoE/IYJ38Fd03+j0s7ZsMuw=";
stage-trial_8 = mkStageTrial version8 "sha256-k0p7SnkEq90bqIlT7PTYAQuhKEDVi+srHwYrpMUtIbM=";
standard_7 = mkStandard version7 "sha256-TA9CiuT21fQedlMUGz7bNNxYun5ArmRjvIxjOGqXDCs=";
stage_7 = mkStage version7 "";
standard-trial_7 = mkStandardTrial version7 "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ=";
stage-trial_7 = mkStageTrial version7 "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc=";
standard_6 = mkStandard version6 "sha256-u6ZNpmHFVOk+r+6Q8OURSfAi41cxMoDvaEXrTtHEAVY=";
stage_6 = mkStage version6 "";
standard-trial_6 = mkStandardTrial version6 "sha256-nHTAqosOJqC0VnRw2/xVpZ6y02vvau6CgfNmgiN/AHs=";
stage-trial_6 = mkStageTrial version6 "sha256-zrv0c/Mxt1EysR7ZvmxtksXAF5MyXTFMNj4KAdO3QnE=";
}

View file

@ -1,63 +1,84 @@
{ config, lib, stdenv
, fetchurl
, autoPatchelfHook
, makeWrapper
, undmg
{
config,
lib,
stdenv,
fetchurl,
autoPatchelfHook,
makeWrapper,
undmg,
, alsa-lib
, curl
, gtk3
, lame
, libxml2
, ffmpeg
, vlc
, xdg-utils
, xdotool
, which
alsa-lib,
curl,
gtk3,
lame,
libxml2,
ffmpeg,
vlc,
xdg-utils,
xdotool,
which,
, jackSupport ? stdenv.hostPlatform.isLinux
, jackLibrary
, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux
, libpulseaudio
jackSupport ? stdenv.hostPlatform.isLinux,
jackLibrary,
pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
libpulseaudio,
}:
let
url_for_platform = version: arch: if stdenv.hostPlatform.isDarwin
then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg"
else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz";
url_for_platform =
version: arch:
if stdenv.hostPlatform.isDarwin then
"https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${
builtins.replaceStrings [ "." ] [ "" ] version
}_universal.dmg"
else
"https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${
builtins.replaceStrings [ "." ] [ "" ] version
}_linux_${arch}.tar.xz";
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.28";
version = "7.29";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = if stdenv.hostPlatform.isDarwin then "sha256-bhrBIXrE3gaAjpqrOtFK9Awb3rKMIckYhpQKVioBbqY=" else {
x86_64-linux = "sha256-HTxuu1IfjDYnCRksW5tjbOLIFz150wBwyJKCkMATlAk=";
aarch64-linux = "sha256-3jH6UwQefhLyymGltw7+//tUaO0V/3VySWuDsS3cqSo=";
}.${stdenv.hostPlatform.system};
hash =
if stdenv.hostPlatform.isDarwin then
"sha256-b1Gb5guaFyWrt9KEwptuXGvfrJAvgnFEl8QuwSufktE="
else
{
x86_64-linux = "sha256-uFK8Y36pYTDK3foCKH9kiq3u1MTir2nNM5KrDwIHEm0=";
aarch64-linux = "sha256-KZTUeEtyAVwIFTmclYv4GcGJ2WXukEF0/mfYmmBPfz0=";
}
.${stdenv.hostPlatform.system};
};
nativeBuildInputs = [
nativeBuildInputs =
[
makeWrapper
] ++ lib.optionals stdenv.hostPlatform.isLinux [
]
++ lib.optionals stdenv.hostPlatform.isLinux [
which
autoPatchelfHook
xdg-utils # Required for desktop integration
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
undmg
];
sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app";
buildInputs = [
buildInputs =
[
(lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6
] ++ lib.optionals stdenv.hostPlatform.isLinux [
]
++ lib.optionals stdenv.hostPlatform.isLinux [
gtk3
alsa-lib
];
runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
runtimeDependencies =
lib.optionals stdenv.hostPlatform.isLinux [
gtk3 # libSwell needs libgdk-3.so.0
]
++ lib.optional jackSupport jackLibrary
@ -65,13 +86,17 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = if stdenv.hostPlatform.isDarwin then ''
installPhase =
if stdenv.hostPlatform.isDarwin then
''
runHook preInstall
mkdir -p "$out/Applications/Reaper.app"
cp -r * "$out/Applications/Reaper.app/"
makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper"
runHook postInstall
'' else ''
''
else
''
runHook preInstall
HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \
@ -88,7 +113,17 @@ stdenv.mkDerivation rec {
# We opt for wrapping the executable with LD_LIBRARY_PATH prefix.
# Note that libcurl and libxml2 are needed for ReaPack to run.
wrapProgram $out/opt/REAPER/reaper \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc ]}"
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath [
curl
lame
libxml2
ffmpeg
vlc
xdotool
stdenv.cc.cc
]
}"
mkdir $out/bin
ln -s $out/opt/REAPER/reaper $out/bin/
@ -103,7 +138,18 @@ stdenv.mkDerivation rec {
homepage = "https://www.reaper.fm/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
maintainers = with maintainers; [ ilian orivej uniquepointer viraptor ];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
maintainers = with maintainers; [
atinba
ilian
orivej
uniquepointer
viraptor
];
};
}

View file

@ -8,14 +8,14 @@ reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9
function set_hash_for_linux() {
local arch=$1
pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz)
pkg_hash=$(nix hash to-sri "sha256:$pkg_hash")
pkg_hash=$(nix hash convert "sha256:$pkg_hash")
update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux --ignore-same-version
}
function set_hash_for_darwin() {
local arch=$1
pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_universal.dmg)
pkg_hash=$(nix hash to-sri "sha256:$pkg_hash")
pkg_hash=$(nix hash convert "sha256:$pkg_hash")
update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin --ignore-same-version
}

View file

@ -9,12 +9,12 @@
replaceVars,
}:
let
version = "0.9.3";
version = "0.10.0";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
tag = "v${version}";
hash = "sha256-j6hBURbIZbvNE69l4AyCtCwfeOi3oNxVtooFK7/WUuA=";
hash = "sha256-MfHI4efAdaoCU8si6YFdznZmSTprthDq3YKuF91z7ss=";
};
libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
blink-fuzzy-lib = rustPlatform.buildRustPackage {

View file

@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gpxsee";
version = "13.33";
version = "13.34";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = finalAttrs.version;
hash = "sha256-5x21KEalRpNhtSNlStziXDyDnvNmqvy6Lq0jgAZ2WE8=";
hash = "sha256-adZTcZGRE0PkG9rntvD3vLIqXOsVxP28LCZrfyVqy9M=";
};
buildInputs =

View file

@ -28,7 +28,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "phoc";
version = "0.41.0";
version = "0.44.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "Phosh";
repo = "phoc";
rev = "v${finalAttrs.version}";
hash = "sha256-T2gKvP3WyrGNOiCwiX93UjMuSTnnZ+nykEAFhq0BF4U=";
hash = "sha256-KaCQtORMJUM7/BLD+Jnbunhd/9/3NYWYx/XMYMo27hI=";
};
nativeBuildInputs = [

View file

@ -1,18 +1,19 @@
{ lib, fetchFromGitHub }:
rec {
version = "1.5.25";
version = "1.5.27";
src = fetchFromGitHub {
owner = "TandoorRecipes";
repo = "recipes";
rev = version;
hash = "sha256-Yw68wxLqoyPRQmP/krSaxByv24CKh7Y7O07NU+dL5mo=";
hash = "sha256-HP4gVk127hvvL337Cb4Wbvvf55RWY7u5RF/FKDCottw=";
};
yarnHash = "sha256-lU8QrTkI32XOHefIkj/0fa2UKhuZpQIT1wyweQnzXmQ=";
meta = with lib; {
homepage = "https://tandoor.dev/";
changelog = "https://github.com/TandoorRecipes/recipes/releases/tag/${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ jvanbruegge ];
};

View file

@ -18,13 +18,13 @@
buildPythonApplication rec {
pname = "matrix-commander";
version = "7.6.2";
version = "8.0.4";
src = fetchFromGitHub {
owner = "8go";
repo = "matrix-commander";
rev = "v${version}";
hash = "sha256-BiQShJHCTvEdkhp21uxxCTxBZ1eezuWE6btMc/wkPlc=";
hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o=";
};
format = "pyproject";

View file

@ -16,6 +16,7 @@
, pulseaudio
, evince
, glib
, modemmanager
, gtk4
, gnome-bluetooth
, gnome-control-center
@ -41,12 +42,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "phosh";
version = "0.41.1";
version = "0.44.0";
src = fetchurl {
# Release tarball which includes subprojects gvc and libcall-ui
url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-Oc6Dltjj+2D3LWZz1eYArqEKEJYYqJPSrScEkxyNhX0=";
hash = "sha256-b4yrSC0TzTuh5kl93DeJNh06ZKjvNhTSjhDzmsEuK2g=";
};
nativeBuildInputs = [
@ -70,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
evolution-data-server
pulseaudio
glib
modemmanager
gcr
networkmanager
polkit

View file

@ -1,13 +1,14 @@
{
lib,
stdenv,
darwin,
fetchFromGitHub,
installShellFiles,
libcap,
nix-update-script,
openssl,
pkg-config,
rustPlatform,
Security,
zlib,
}:
@ -17,9 +18,9 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
repo = "authoscope";
tag = "v${version}";
hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
};
cargoHash = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k=";
@ -29,11 +30,15 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs = [
buildInputs =
[
libcap
zlib
openssl
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
]
++ lib.optional stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
];
postInstall = ''
installManPage docs/${pname}.1
@ -42,10 +47,13 @@ rustPlatform.buildRustPackage rec {
# Tests requires access to httpin.org
doCheck = false;
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Scriptable network authentication cracker";
homepage = "https://github.com/kpcyrd/authoscope";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
changelog = "https://github.com/kpcyrd/authoscope/releases/tag/v${version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ fab ];
};
}

View file

@ -11,7 +11,7 @@
coreutils,
util-linux,
gnugrep,
gnupg1,
gnupg,
gnutar,
gnused,
gzip,
@ -32,7 +32,7 @@ let
dpkg
gawk
gnugrep
gnupg1
gnupg
gnused
gnutar
gzip

View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "diffnav";
version = "0.2.8";
version = "0.3.0";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "diffnav";
rev = "refs/tags/v${version}";
hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4=";
hash = "sha256-JXxeRq8OuTvzkbxDr1xVXeW0RFtCRyEbhCGvXeWHb0g=";
};
vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI=";

View file

@ -17,14 +17,14 @@ let
in
flutter324.buildFlutterApplication rec {
pname = "ente-auth";
version = "4.2.2";
version = "4.2.3";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
sparseCheckout = [ "auth" ];
tag = "auth-v${version}";
hash = "sha256-pg2ivtTsMtDRNmxp2SQwI2n94qg60q8JfIWoO/rEUJE=";
hash = "sha256-G+uSEEJUD8mq8d7FJRKSHjpcFsILZJmtpgBmtpQYP58=";
};
sourceRoot = "${src.name}/auth";

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "flirt";
version = "0.2.1";
version = "0.3";
src = fetchFromSourcehut {
owner = "~hadronized";
repo = "flirt";
rev = "v${version}";
hash = "sha256-LCwSETvXHAUbe4QIeGpT7vVbuZl1SDfIehVG8svkmHM=";
hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0=";
};
cargoHash = "sha256-EquriyhfbYyi87TP3zuLiCXDV7baDRaTRuZd7Yht/UA=";
cargoHash = "sha256-9DmTSx1sKINnvJv3px8UKaa5j8AUnJiYB1lwnBR+xn8=";
passthru.updateScript = nix-update-script { };

View file

@ -1,73 +1,116 @@
{
lib,
stdenv,
cargo,
desktop-file-utils,
fetchurl,
pkg-config,
glib,
gnome,
gtk3,
wrapGAppsHook3,
librsvg,
gsound,
gettext,
gtk4,
itstool,
libadwaita,
librsvg,
libxml2,
libgnome-games-support,
libgee,
gst_all_1,
meson,
ninja,
vala,
python3,
desktop-file-utils,
adwaita-icon-theme,
pkg-config,
rustc,
rustPlatform,
wrapGAppsHook4,
_experimental-update-script-combinators,
common-updater-scripts,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-robots";
version = "40.0";
version = "41.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/gnome-robots-${version}.tar.xz";
hash = "sha256-b78viFdQ8aURCnJPjzWt3ZvGEYTuMc8MDLiZU+T0yxE=";
url = "mirror://gnome/sources/gnome-robots/${lib.versions.major finalAttrs.version}/gnome-robots-${finalAttrs.version}.tar.xz";
hash = "sha256-K4BQcFrIPpOL56iREyYB62XHk/IJzX6RDGzWQphzBHg=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
name = "gnome-robots-${finalAttrs.version}";
hash = "sha256-rn/rs0D2qKDYf8oxpegQalPQIVuT8rSrHTzeZqWGn44=";
};
nativeBuildInputs = [
pkg-config
meson
ninja
vala
python3
libxml2
wrapGAppsHook3
gettext
cargo
rustc
rustPlatform.cargoSetupHook
gtk4 # for gtk4-update-icon-cache
wrapGAppsHook4
itstool
desktop-file-utils
];
buildInputs = [
gtk3
glib
gtk4
libadwaita
librsvg
gsound
libgnome-games-support
libgee
adwaita-icon-theme
libxml2
# Sound playback, not checked at build time.
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
];
postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
# https://gitlab.gnome.org/GNOME/gnome-robots/-/merge_requests/38
substituteInPlace data/icons/meson.build \
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
'';
preFixup = ''
# Seal GStreamer plug-ins so that we can notice when they are missing.
gappsWrapperArgs+=(--set "GST_PLUGIN_SYSTEM_PATH_1_0" "$GST_PLUGIN_SYSTEM_PATH_1_0")
unset GST_PLUGIN_SYSTEM_PATH_1_0
'';
passthru = {
updateScript = gnome.updateScript { packageName = "gnome-robots"; };
updateScript =
let
updateSource = gnome.updateScript {
packageName = "gnome-robots";
};
updateLockfile = {
command = [
"sh"
"-c"
''
PATH=${
lib.makeBinPath [
common-updater-scripts
]
}
update-source-version gnome-robots --ignore-same-version --source-key=cargoDeps > /dev/null
''
];
# Experimental feature: do not copy!
supportedFeatures = [ "silent" ];
};
in
_experimental-update-script-combinators.sequence [
updateSource
updateLockfile
];
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-robots";
changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${version}/NEWS?ref_type=tags";
changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
description = "Avoid the robots and make them crash into each other";
mainProgram = "gnome-robots";
maintainers = teams.gnome.members;
license = licenses.gpl3Plus;
platforms = platforms.unix;
};
}
})

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "golangci-lint";
version = "1.63.1";
version = "1.63.4";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
hash = "sha256-Q7SwLm+rnwyjlXf8iArUQWYC0DyjFZI9HIWJsgNplyw=";
hash = "sha256-7nIo6Nuz8KLuQlT7btjnTRFpOl+KVd30v973HRKzh08=";
};
vendorHash = "sha256-Rsg/bVbMsA2dUz0GjAdzifBTpDDVrFYY+ptyB5m3AgM=";
vendorHash = "sha256-atr4HMxoPEfGeaNlHqwTEAcvgbSyzgCe262VUg3J86c=";
subPackages = [ "cmd/golangci-lint" ];

View file

@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "gom";
version = "0.4";
version = "0.5.3";
outputs = [
"out"
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38";
url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz";
sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc=";
};
patches = [
@ -54,8 +54,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
packageName = "gom";
};
};

View file

@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gxml";
version = "0.20.3";
version = "0.20.4";
outputs = [
"out"
@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GNOME";
repo = "gxml";
rev = finalAttrs.version;
hash = "sha256-GlctGxsLyQ2kPV3oBmusRiouG4PPncBTh3vgxhVaQOo=";
hash = "sha256-/gaWuUytBsvAsC95ee6MtTW6g3ltGbkD+JWqrAjJLDc=";
};
nativeBuildInputs = [
@ -47,8 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
# https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/24
# https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/28
substituteInPlace gxml/gxml.pc.in \
--replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include"
--replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include" \
--replace-fail ">=2" ">= 2" \
--replace-fail ">=0" ">= 0"
'';
doCheck = true;

View file

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.140.1";
version = "0.140.2";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
tag = "v${version}";
hash = "sha256-9H7hXBz/rKJZr/XvqFRmOQylf6sfJtkwik3jh/k+Vec=";
hash = "sha256-4W/iUJHVsmCrIR5z0qSQ/Fsa4qtiuSie6/cot6oYQNM=";
};
vendorHash = "sha256-swcj1JxYoRqKscu/IC0uiAATp4AXN0aANWkSq/mJsyc=";
vendorHash = "sha256-gyXvxg1pKf0MYbwf2FTUnDLSBf0Bcb4uNZ5rDq/2QGY=";
checkFlags =
let

View file

@ -72,8 +72,8 @@ python3Packages.buildPythonApplication rec {
preBuild = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools==69.0.2" "setuptools" \
--replace-fail "wheel==0.42.0" "wheel"
--replace-fail "setuptools==75.6.0" "setuptools" \
--replace-fail "wheel==0.45.1" "wheel"
substituteInPlace src/foundation/__init__.py \
--replace-fail "0.0.1" "${version}"

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "nuclei";
version = "3.3.7";
version = "3.3.8";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "nuclei";
tag = "v${version}";
hash = "sha256-cvbxLEXPvJgAWHAMmHXPyHtBkYOOXj9xz1zfrm8oLG4=";
hash = "sha256-RL6/H1X6+rt9n1rpeRpKv+u3SloOnRX6YzMKDDQw+78=";
};
vendorHash = "sha256-+eAZ/YJc8nqeTu8oRu2H6EFUyI5HDQZNO+hCUARPtcA=";
vendorHash = "sha256-k4seYTUO7BmU2HhTWweDRfNnXp+HshWM1riSc9BbYYg=";
proxyVendor = true; # hash mismatch between Linux and Darwin

View file

@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "oterm";
version = "0.6.9";
version = "0.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ggozad";
repo = "oterm";
tag = version;
hash = "sha256-ltzwb6r7zg41jlTJdU+/zTJ0H6jOL/4NKCZRBN6HQR4=";
hash = "sha256-COIvnn6qDG9srv4ByWTBoRHfIva3a2dLS+yIZDguo+M=";
};
pythonRelaxDeps = [

View file

@ -2,48 +2,57 @@
lib,
fetchFromGitHub,
buildGoModule,
testers,
versionCheckHook,
nix-update-script,
pinact,
}:
let
pname = "pinact";
version = "1.0.0";
version = "1.1.2";
src = fetchFromGitHub {
owner = "suzuki-shunsuke";
repo = "pinact";
rev = "v${version}";
hash = "sha256-fOmQDfqG1aWzpL80Nc8JA6HWQR+z9mhqtwU4rC2g2Gg=";
tag = "v${version}";
hash = "sha256-QBWxs0YRTWItJ1aTG33Z6vK8/vaZBTuZAVPYqD6dIvE=";
};
mainProgram = "pinact";
in
buildGoModule {
inherit pname version src;
vendorHash = "sha256-AFlkzs5mL/x9CwfF2apLcQbiu60GD33oFH6lQDHAL1M=";
vendorHash = "sha256-Y44nJv0eWM0xO+lB56OBcEe/CCipPj8Ptg7WuJ2Vszo=";
env.CGO_ENABLED = 0;
doCheck = true;
passthru = {
tests.version = testers.testVersion {
package = pinact;
};
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${mainProgram}";
versionCheckProgramArg = [ "version" ];
passthru = {
updateScript = nix-update-script { };
};
ldflags = [
"-s"
"-w"
"-X main.version=${version} -X main.commit=${src.rev}"
"-X main.version=${version} -X main.commit=v${version}"
];
meta = with lib; {
subPackages = [
"cmd/pinact"
];
meta = {
inherit mainProgram;
description = "Pin GitHub Actions versions";
homepage = "https://github.com/suzuki-shunsuke/pinact";
changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = [ maintainers.kachick ];
mainProgram = "pinact";
changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kachick ];
};
}

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "poetry-plugin-shell";
version = "1.0.0";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "python-poetry";
repo = "poetry-plugin-shell";
tag = version;
hash = "sha256-ynbZCzic6bAIwtG0rGk4oMPc8pm59UFboNAGUb0qJnE=";
hash = "sha256-BntObwrW7xt1gYWpckLJF7GklkmUJMh8D1IUwCcOOl4=";
};
build-system = [ poetry-core ];

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "protoc-gen-connect-go";
version = "1.17.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = "connectrpc";
repo = "connect-go";
tag = "v${version}";
hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs=";
hash = "sha256-/RfGduRfXEZO66qhKOOMpESNxBghjqf/vbg1gkCPyHM=";
};
vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo=";

View file

@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "squeekboard";
version = "1.41.0";
version = "1.43.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -31,13 +31,13 @@ stdenv.mkDerivation rec {
owner = "Phosh";
repo = pname;
rev = "v${version}";
hash = "sha256-WHGdA0cEB1nu7vJ+pwjdl8aZzccJ232vsbSGmZohFVo=";
hash = "sha256-UsUr4UnYNo2ybEdNyOD/IiafEZ1YJFwRQ3CVy76X2H0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-CRKaH8cA/EhXQna3zCU0Z06zkB9qu6QxPJ4No3NFcs0=";
hash = "sha256-1yBGn8cZxwpEOeF2BcUIIcI4Uxn80vRau/MvlufX9GU=";
};
nativeBuildInputs = [

View file

@ -7,17 +7,20 @@
python3.pkgs.buildPythonApplication rec {
pname = "troubadix";
version = "24.11.0";
version = "25.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "greenbone";
repo = "troubadix";
tag = "v${version}";
hash = "sha256-N+XZXXGIoZ9wN4GU0iHEEY8D/buFQ/5om86FTgAyvyw=";
hash = "sha256-cb9U1xxN5pUVRiB8JKCWd4XtnkH72XH7QnvFATXaPgY=";
};
pythonRelaxDeps = [ "validators" ];
pythonRelaxDeps = [
"pontos"
"validators"
];
build-system = with python3.pkgs; [ poetry-core ];

View file

@ -0,0 +1,12 @@
--- vorbisgain-0.37/misc.c 2004-01-03 16:17:28.000000000 -0500
+++ vorbisgain-0.37-patched/misc.c 2025-01-07 20:51:12.989521816 -0500
@@ -56,8 +56,7 @@
vfprintf(stderr, message, args);
va_end(args);
- fprintf(stderr, strerror(err_num));
- fprintf(stderr, "\n");
+ fprintf(stderr, "%s\n", strerror(err_num));
}

View file

@ -0,0 +1,10 @@
--- vorbisgain-0.37/misc.c 2004-01-03 16:17:28.000000000 -0500
+++ vorbisgain-0.37-patched/misc.c 2025-01-07 20:35:13.056221211 -0500
@@ -23,6 +23,7 @@
#else /* WIN32 */
#include <errno.h>
#include <ctype.h>
+#include <unistd.h>
#ifndef DISABLE_WINSIZE

View file

@ -15,18 +15,16 @@ stdenv.mkDerivation rec {
sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx";
};
hardeningDisable = [ "format" ];
patches = [
./isatty.patch
./fprintf.patch
];
buildInputs = [
libogg
libvorbis
];
patchPhase = ''
chmod -v +x configure
configureFlags="--mandir=$out/share/man"
'';
meta = with lib; {
homepage = "https://sjeng.org/vorbisgain.html";
description = "Utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness";

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "xeol";
version = "0.10.1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "xeol-io";
repo = "xeol";
tag = "v${version}";
hash = "sha256-4fMH07XKMnpX54mS9pAuTBiHcP6nXj8vpuk3f/3ik+k=";
hash = "sha256-4+3/k46HvNZ+hl6oYAWaRewzz4sPEfO5Tb/vCZyXGkI=";
};
vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs=";
vendorHash = "sha256-OsUsWd5AvNjAJzrC68Ed4+ZAnMY0JLB0d43eUI0Eivg=";
proxyVendor = true;

View file

@ -20,6 +20,13 @@
lib.switch
[ coq.version mathcomp.version ]
[
{
cases = [
(range "8.16" "8.20")
(isGe "2.1.0")
];
out = "2.0.3";
}
{
cases = [
(range "8.16" "8.20")
@ -79,6 +86,7 @@
]
null;
release."2.0.3".sha256 = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0=";
release."2.0.1".sha256 = "sha256-d/IQ4IdS2tpyPewcGobj2S6m2HU+iXQmlvR+ITNIcjI=";
release."2.0.0".sha256 = "sha256-SG/KVnRJz2P+ZxkWVp1dDOnc/JVgigoexKfRUh1Y0GM";
release."1.1.3".sha256 = "sha256-xhqWpg86xbU1GbDtXXInNCTArjjPnWZctWiiasq1ScU=";

View file

@ -16,6 +16,13 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version ssreflect.version ]
[
{
cases = [
(range "8.17" "8.20")
(isGe "2.0.0")
];
out = "0.2.1";
}
{
cases = [
(range "8.17" "8.20")
@ -35,6 +42,7 @@ mkCoqDerivation {
releaseRev = v: "v${v}";
release."0.2.1".sha256 = "sha256-053bNa3rcy0fCs9CQoKPxDLXnKRHzteyClLDURpaZJo=";
release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM=";
release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI=";
release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh";

View file

@ -17,6 +17,13 @@
lib.switch
[ coq.coq-version ssreflect.version ]
[
{
cases = [
(range "8.17" "8.20")
(isGe "2.0.0")
];
out = "0.5.0";
}
{
cases = [
(range "8.17" "8.20")
@ -50,6 +57,7 @@
releaseRev = v: "v${v}";
release."0.5.0".sha256 = "sha256-Guu2+tmHym52DA6SB5Rq/rYWIQEl47Q7YvMaUkfOH2k=";
release."0.4.0".sha256 = "sha256-hItFO2XY2LTPSofPTKt3AfOEfiLliaYdzUXgDv4ea9Y=";
release."0.3.1".sha256 = "sha256-KcuG/11Yq5ACem4FyVnQqHKvy3tNK7hd0ir2SJzzMN0=";
release."0.3.0".sha256 = "sha256:14rm0726f1732ldds495qavg26gsn30w6dfdn36xb12g5kzavp38";

View file

@ -27,7 +27,7 @@ mkCoqDerivation {
{
cases = [
(range "8.16" "8.20")
(range "2.0" "2.2")
(range "2.0" "2.3")
];
out = "2.2";
}

View file

@ -29,7 +29,7 @@ mkCoqDerivation {
{
cases = [
(range "8.16" "8.19")
(range "2.0.0" "2.2.0")
(range "2.0.0" "2.3.0")
];
out = "0.9.4";
}

View file

@ -5,6 +5,7 @@ let hb = mkCoqDerivation {
owner = "math-comp";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.19" "8.20"; out = "1.8.0"; }
{ case = range "8.18" "8.20"; out = "1.7.1"; }
{ case = range "8.16" "8.18"; out = "1.6.0"; }
{ case = range "8.15" "8.18"; out = "1.5.0"; }
@ -13,6 +14,7 @@ let hb = mkCoqDerivation {
{ case = range "8.12" "8.13"; out = "1.1.0"; }
{ case = isEq "8.11"; out = "0.10.0"; }
] null;
release."1.8.0".sha256 = "sha256-4s/4ZZKj5tiTtSHGIM8Op/Pak4Vp52WVOpd4l9m19fY=";
release."1.7.1".sha256 = "sha256-MCmOzMh/SBTFAoPbbIQ7aqd3hMcSMpAKpiZI7dbRaGs=";
release."1.7.0".sha256 = "sha256-WqSeuJhmqicJgXw/xGjGvbRzfyOK7rmkVRb6tPDTAZg=";
release."1.6.0".sha256 = "sha256-E8s20veOuK96knVQ7rEDSt8VmbtYfPgItD0dTY/mckg=";

View file

@ -15,6 +15,7 @@ let
repo = "analysis";
owner = "math-comp";
release."1.8.0".sha256 = "sha256-2ZafDmZAwGB7sxdUwNIE3xvwBRw1kFDk0m5Vz+onWZc=";
release."1.7.0".sha256 = "sha256-GgsMIHqLkWsPm2VyOPeZdOulkN00IoBz++qA6yE9raQ=";
release."1.5.0".sha256 = "sha256-EWogrkr5TC5F9HjQJwO3bl4P8mij8U7thUGJNNI+k88=";
release."1.4.0".sha256 = "sha256-eDggeuEU0fMK7D5FbxvLkbAgpLw5lwL/Rl0eLXAnJeg=";
@ -49,9 +50,9 @@ let
{
cases = [
(range "8.19" "8.20")
(range "2.1.0" "2.2.0")
(range "2.1.0" "2.3.0")
];
out = "1.7.0";
out = "1.8.0";
}
{
cases = [

View file

@ -23,6 +23,13 @@
lib.switch
[ coq.version mathcomp-analysis.version ]
[
{
cases = [
(range "8.19" "8.20")
(isGe "1.7")
];
out = "0.7.7";
}
{
cases = [
(range "8.19" "8.20")
@ -74,6 +81,7 @@
}
]
null;
release."0.7.7".sha256 = "sha256-kEbpMl7U+I2kvqi1VrjhIVFkZFO6h0tTHEUZRbHYG7E=";
release."0.7.5".sha256 = "sha256-pzPo+Acjx3vlyqOkSZQ8uT2BDLSTfbAnRm39e+/CqE0=";
release."0.7.3".sha256 = "sha256-7+qPtE1KfDmo9ZsQtWMzoR2MYnFpTjFHK/yZYVm+GxA=";
release."0.7.2".sha256 = "sha256-dekrdVmuTcqXXmKhIb831EKtMhbPrXHJZhzmGb9rdRo=";

View file

@ -17,6 +17,7 @@ mkCoqDerivation {
owner = "math-comp";
inherit version;
release = {
"2.0.2".sha256 = "sha256-hBo9JMtmXDYBmf5ihKGksQLHv3c0+zDBnd8/aI2V/ao=";
"2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic=";
"2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8=";
"1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4=";
@ -34,6 +35,13 @@ mkCoqDerivation {
lib.switch
[ coq.version mathcomp.version ]
[
{
cases = [
(isGe "8.17")
(isGe "2.1.0")
];
out = "2.0.2";
}
{
cases = [
(isGe "8.17")

View file

@ -20,6 +20,7 @@ let
withDoc = single && (args.withDoc or false);
defaultVersion = let inherit (lib.versions) range; in
lib.switch coq.coq-version [
{ case = range "8.19" "8.20"; out = "2.3.0"; }
{ case = range "8.17" "8.20"; out = "2.2.0"; }
{ case = range "8.17" "8.18"; out = "2.1.0"; }
{ case = range "8.17" "8.18"; out = "2.0.0"; }
@ -39,6 +40,7 @@ let
{ case = range "8.5" "8.7"; out = "1.6.4"; }
] null;
release = {
"2.3.0".sha256 = "sha256-wa6OBig8rhAT4iwupSylyCAMhO69rADa0MQIX5zzL+Q=";
"2.2.0".sha256 = "sha256-SPyWSI5kIP5w7VpgnQ4vnK56yEuWnJylNQOT7M77yoQ=";
"2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo=";
"2.0.0".sha256 = "sha256-dpOmrHYUXBBS9kmmz7puzufxlbNpIZofpcTvJFLG5DI=";

View file

@ -24,6 +24,13 @@ mkCoqDerivation {
lib.switch
[ coq.version mathcomp.version ]
[
{
cases = [
(range "8.17" "8.20")
(isGe "2.1.0")
];
out = "2.3.0";
}
{
cases = [
(range "8.17" "8.20")
@ -104,6 +111,7 @@ mkCoqDerivation {
]
null;
release = {
"2.3.0".sha256 = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts=";
"2.2.0".sha256 = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo=";
"2.1.0".sha256 = "sha256-QT91SBJ6DXhyg4j/okTvPP6yj2DnnPbnSlJ/p8pvZbY=";
"2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8=";

View file

@ -9,6 +9,7 @@ mkCoqDerivation {
pname = "odd-order";
owner = "math-comp";
release."2.1.0".sha256 = "sha256-TPlaQbO0yXEpUgy3rlCx/w1MSLECJk5tdU26fAGe48Q=";
release."1.14.0".sha256 = "0iln70npkvixqyz469l6nry545a15jlaix532i1l7pzfkqqn6v68";
release."1.13.0".sha256 = "sha256-EzNKR/JzM8T17sMhPhgZNs14e50X4dY3OwFi133IsT0=";
release."1.12.0".sha256 = "sha256-omsfdc294CxKAHNMMeqJCcVimvyRCHgxcQ4NJOWSfNM=";
@ -18,6 +19,10 @@ mkCoqDerivation {
defaultVersion =
with lib.versions;
lib.switch mathcomp.character.version [
{
case = (range "2.1.0" "2.3.0");
out = "2.1.0";
}
{
case = (range "1.13.0" "1.15.0");
out = "1.14.0";

View file

@ -21,6 +21,13 @@
lib.switch
[ coq.coq-version mathcomp-ssreflect.version ]
[
{
cases = [
(range "8.18" "8.20")
"2.3.0"
];
out = "0.2.3";
}
{
cases = [
(range "8.18" "8.20")
@ -47,6 +54,7 @@
releaseRev = v: "v${v}";
release."0.2.3".sha256 = "sha256-Y3dmNIF36IuIgrVILteofOv8e5awKfq93S4YN7enswI=";
release."0.2.2".sha256 = "sha256-tBF8equJd6hKZojpe+v9h6Tg9xEnMTVFgOYK7ZnMfxk=";
release."0.2.1".sha256 = "sha256-X00q5QFxdcGWeNqOV/PLTOqQyyfqFEinbGUTO7q8bC4=";
release."0.2.0".sha256 = "sha256-GDkWH0LUsW165vAUoYC5of9ndr0MbfBtmrPhsJVXi3o=";

View file

@ -1,35 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
pytest,
}:
buildPythonPackage rec {
pname = "py3to2";
version = "1.1.1";
src = fetchPypi {
inherit version;
pname = "3to2";
extension = "zip";
sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c";
};
nativeCheckInputs = [ pytest ];
checkPhase = ''
py.test lib3to2/tests
'';
# Test failing due to upstream issue (https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35)
doCheck = false;
meta = {
homepage = "https://bitbucket.org/amentajo/lib3to2";
description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible";
mainProgram = "3to2";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mt-caret ];
};
}

View file

@ -14,12 +14,13 @@
pytestCheckHook,
pythonOlder,
syrupy,
time-machine,
tzlocal,
}:
buildPythonPackage rec {
pname = "aioautomower";
version = "2024.12.0";
version = "2025.1.0";
pyproject = true;
disabled = pythonOlder "3.11";
@ -28,7 +29,7 @@ buildPythonPackage rec {
owner = "Thomas55555";
repo = "aioautomower";
tag = version;
hash = "sha256-JLlmvd6Hgf1a3YU9xfbw8plEbRDNgCzxF3PpveGsrPg=";
hash = "sha256-MEZdYOpBAHmWidzq+7SpEFsHNYlSaIQ4utnGK9Y3/NE=";
};
postPatch = ''
@ -53,6 +54,7 @@ buildPythonPackage rec {
pytest-asyncio
pytest-cov-stub
pytestCheckHook
time-machine
syrupy
];

View file

@ -10,9 +10,11 @@
hatchling,
httpx,
jiter,
nest-asyncio,
pydantic,
pytest-asyncio,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
respx,
sniffio,
@ -22,7 +24,7 @@
buildPythonPackage rec {
pname = "anthropic";
version = "0.39.0";
version = "0.42.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -31,7 +33,7 @@ buildPythonPackage rec {
owner = "anthropics";
repo = "anthropic-sdk-python";
tag = "v${version}";
hash = "sha256-lpW+waHvwgbhK7EnPZy/XI8gK3a8JjFflPqUFbDN1z8=";
hash = "sha256-7cRXKXiyq3ty21klkitjjnm9rzBRmAXGYvvVxTNWeZ4=";
};
build-system = [
@ -57,15 +59,21 @@ buildPythonPackage rec {
nativeCheckInputs = [
dirty-equals
pytest-asyncio
nest-asyncio
pytestCheckHook
respx
];
pythonImportsCheck = [ "anthropic" ];
disabledTests = [
disabledTests =
[
# Test require network access
"test_copy_build_request"
]
++ lib.optionals (pythonAtLeast "3.13") [
# Fails on RuntimeWarning: coroutine method 'aclose' of 'AsyncStream._iter_events' was never awaited
"test_multi_byte_character_multiple_chunks[async]"
];
disabledTestPaths = [

View file

@ -359,7 +359,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.35.93";
version = "1.35.94";
pyproject = true;
disabled = pythonOlder "3.7";
@ -367,7 +367,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-mCAsipukijtuQ0qc+d5JktfMk+5QXx/EgcV82cgBYj0=";
hash = "sha256-KgYVjr8QsDAD/SnzqXPY24at0Uf+1knwE97gFOumhVA=";
};
build-system = [ setuptools ];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.35.93";
version = "1.35.94";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-aHLv6iTWsd0fAbdmL/HgvX+bcRDabWRHt4wbhdlDFR8=";
hash = "sha256-ceRBSq77afed9XtZW60JwMsIqqmAxy3PGufUJt4q1aI=";
};
nativeBuildInputs = [ setuptools ];

View file

@ -2,7 +2,6 @@
lib,
stdenv,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
# build-system
@ -13,12 +12,12 @@
# dependencies
clarabel,
cvxopt,
ecos,
osqp,
scipy,
scs,
# checks
hypothesis,
pytestCheckHook,
useOpenmp ? (!stdenv.hostPlatform.isDarwin),
@ -26,16 +25,14 @@
buildPythonPackage rec {
pname = "cvxpy";
version = "1.5.3";
version = "1.6.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "cvxpy";
repo = "cvxpy";
tag = "v${version}";
hash = "sha256-6RaEyFckvF3WhbfeffysMB/zt+aU1NU6B7Nm06znt9k=";
hash = "sha256-t2+j0ZrvGvTv6FoNVpD2MVFZKfGgqTaN32OKwBXM3Zw=";
};
# we need to patch out numpy version caps from upstream
@ -53,14 +50,16 @@ buildPythonPackage rec {
dependencies = [
clarabel
cvxopt
ecos
numpy
osqp
scipy
scs
];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
hypothesis
pytestCheckHook
];
# Required flags from https://github.com/cvxpy/cvxpy/releases/tag/v1.1.11
preBuild = lib.optionalString useOpenmp ''
@ -84,7 +83,7 @@ buildPythonPackage rec {
description = "Domain-specific language for modeling convex optimization problems in Python";
homepage = "https://www.cvxpy.org/";
downloadPage = "https://github.com/cvxpy/cvxpy//releases";
changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}";
changelog = "https://github.com/cvxpy/cvxpy/releases/tag/${src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ drewrisinger ];
};

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "environs";
version = "11.2.1";
version = "14.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "sloria";
repo = "environs";
tag = version;
hash = "sha256-BU2D9NGNoUu3F1kx9t4j1VW0HarLVqiXTZEW67pMPV8=";
hash = "sha256-sqEe0DoJHUtHFin04+lNQKuXjvSmDmfwjQIvU6a4sDo=";
};
nativeBuildInputs = [ flit-core ];

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "model-bakery";
version = "1.20.0";
version = "1.20.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "model-bakers";
repo = "model_bakery";
tag = version;
hash = "sha256-71c5p6FypqbwUUoYu4dTamYnBlks1fiXTp7dUfc0ZQs=";
hash = "sha256-VA3rRzu1FhgCRCSRBQ+cZkwHVZr5/e++twk3hOWuc2c=";
};
build-system = [ hatchling ];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "model-checker";
version = "0.6.10";
version = "0.7.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "model_checker";
inherit version;
hash = "sha256-L0dtNsuU6JQl0PRHB7UayLCdPwxk70FZYNomMUy/wW4=";
hash = "sha256-xwF0KCFso1Yno8mUFnVgMbVbhanvANsDtvS/WaUgSwI=";
};
# z3 does not provide a dist-info, so python-runtime-deps-check will fail

View file

@ -28,7 +28,10 @@ buildPythonPackage rec {
hash = "sha256-VMZLEirE01Q9eyQIhV18PepGWmBcxLIwNeuVf7EuSWE=";
};
pythonRelaxDeps = [ "pandas" ];
pythonRelaxDeps = [
"numpy"
"pandas"
];
nativeBuildInputs = [
poetry-core

View file

@ -28,7 +28,10 @@ buildPythonPackage rec {
hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y=";
};
pythonRelaxDeps = [ "scikit-learn" ];
pythonRelaxDeps = [
"numpy"
"scikit-learn"
];
nativeBuildInputs = [ poetry-core ];

View file

@ -26,7 +26,10 @@ buildPythonPackage rec {
hash = "sha256-2VNLXVciWInkZwk9O+U+6oU+FOVQx3InV4UVgny/B6I=";
};
pythonRelaxDeps = [ "pandas" ];
pythonRelaxDeps = [
"numpy"
"pandas"
];
nativeBuildInputs = [
poetry-core

View file

@ -27,18 +27,22 @@ buildPythonPackage rec {
sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY=";
};
nativeBuildInputs = [
build-system = [
poetry-core
toml-adapt
];
propagatedBuildInputs = [
dependencies = [
niapy
numpy
scikit-learn
torch
];
pythonRelaxDeps = [
"numpy"
];
# create niapy and torch dep version consistent
preBuild = ''
toml-adapt -path pyproject.toml -a change -dep niapy -ver X

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "niapy";
version = "2.5.1";
version = "2.5.2";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "NiaOrg";
repo = "NiaPy";
tag = "v${version}";
hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo=";
hash = "sha256-8hKT0WxnJijm22w4DkzicvtikaTL/mL3VhQX/WVHL58=";
};
build-system = [ poetry-core ];
@ -35,6 +35,10 @@ buildPythonPackage rec {
pandas
];
pythonRelaxDeps = [
"numpy"
];
nativeCheckInputs = [
pytest7CheckHook
pytest-xdist

View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "24.12.4";
version = "25.1.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = "pontos";
tag = "v${version}";
hash = "sha256-Ri5MtUfIHE0s3Csaf08RZjGvl5HYxZJSn/JwNkkXvRA=";
hash = "sha256-Aw5PU3YfWH/YxOWkJcrUwhio71ASasZzyAsnjztOm5o=";
};
build-system = [ poetry-core ];

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pygitguardian";
version = "1.18.0";
version = "1.19.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "GitGuardian";
repo = "py-gitguardian";
tag = "v${version}";
hash = "sha256-4qMcBtelLiqLXKV8YIw9M6e97Nbo/K8UpsKoR0W7uKM=";
hash = "sha256-g3OH6pPk6Whd0JW6voILEK40/z6gWrdT6ibSa5kW47Q=";
};
pythonRelaxDeps = [
@ -33,9 +33,7 @@ buildPythonPackage rec {
"setuptools"
];
build-system = [
pdm-backend
];
build-system = [ pdm-backend ];
dependencies = [
marshmallow
@ -53,33 +51,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pygitguardian" ];
disabledTests = [
# Tests require an API key
"test_api_tokens"
"test_bogus_rate_limit"
"test_compute_sca_files"
"test_content_scan_exceptions"
"test_content_scan"
"test_create_honeytoken"
"test_create_jwt"
"test_extra_headers"
"test_health_check"
"test_multi_content_exceptions"
"test_multi_content_scan"
"test_multiscan_parameters"
"test_quota_overview"
"test_rate_limit"
"test_read_metadata_bad_response"
"test_read_metadata_no_remediation_message"
"test_read_metadata_remediation_message"
"test_retrieve_secret_incident"
"test_sca_client_scan_diff"
"test_sca_scan_all_with_params"
"test_sca_scan_directory_invalid_tar"
"test_sca_scan_directory"
"test_scan"
"test_versions_from_headers"
];
env.GITGUARDIAN_API_KEY = "Test key for tests";
meta = with lib; {
description = "Library to access the GitGuardian API";

View file

@ -1,35 +1,41 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
# build-system
cython_0,
oldest-supported-numpy,
setuptools,
# dependencies
numpy,
packaging,
scipy,
# tests
pytestCheckHook,
pytest-rerunfailures,
python,
# optional-dependencies
matplotlib,
ipython,
cvxopt,
cvxpy,
cython_0,
fetchFromGitHub,
ipython,
matplotlib,
numpy,
oldest-supported-numpy,
packaging,
pytest-rerunfailures,
pytestCheckHook,
python,
pythonOlder,
scipy,
setuptools,
}:
buildPythonPackage rec {
pname = "qutip";
version = "5.0.4";
version = "5.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
owner = "qutip";
repo = "qutip";
tag = "v${version}";
hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo=";
hash = "sha256-8P95uAalMeGXWNG8J8Rf/eg0x1K62o9rKjmDrB8KGRo=";
};
postPatch = ''
@ -38,13 +44,13 @@ buildPythonPackage rec {
--replace-fail "numpy>=2.0.0" "numpy"
'';
nativeBuildInputs = [
build-system = [
cython_0
setuptools
oldest-supported-numpy
setuptools
];
propagatedBuildInputs = [
dependencies = [
numpy
packaging
scipy
@ -74,20 +80,30 @@ buildPythonPackage rec {
pythonImportsCheck = [ "qutip" ];
pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
# Fatal Python error: Aborted
"--deselect=../tests/core/test_metrics.py::Test_hellinger_dist::test_monotonicity[25]"
];
optional-dependencies = {
graphics = [ matplotlib ];
ipython = [ ipython ];
semidefinite = [
cvxpy
cvxopt
cvxpy
];
};
meta = with lib; {
meta = {
description = "Open-source software for simulating the dynamics of closed and open quantum systems";
homepage = "https://qutip.org/";
changelog = "https://github.com/qutip/qutip/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ fabiangd ];
changelog = "https://github.com/qutip/qutip/releases/tag/${src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fabiangd ];
badPlatforms = [
# Tests fail at ~80%
# ../tests/test_animation.py::test_result_state Fatal Python error: Aborted
lib.systems.inspect.patterns.isDarwin
];
};
}

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "recurring-ical-events";
version = "3.3.4";
version = "3.4.0";
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "niccokunzmann";
repo = "python-recurring-ical-events";
tag = "v${version}";
hash = "sha256-3KlmJJmak3X9adUlcmclnCv9D1Ddr+woFokrinZBYoE=";
hash = "sha256-+spbfeJ1hMMQqLj9IIu2xj4J6y1r2f94b4NK8vcDF5M=";
};
build-system = [ setuptools ];

View file

@ -0,0 +1,31 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
unittestCheckHook,
}:
buildPythonPackage rec {
pname = "stop-words";
version = "2018.7.23";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-bfOtX13ml9qkN+REXIbHNgTmvBON0NwPrFVmSqTmsD4=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ unittestCheckHook ];
pythonImportsCheck = [ "stop_words" ];
meta = {
description = "Get list of common stop words in various languages in Python";
homepage = "https://github.com/Alir3z4/python-stop-words";
license = [ lib.licenses.bsd3 ];
maintainers = with lib.maintainers; [ lavafroth ];
};
}

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "stringzilla";
version = "3.11.1";
version = "3.11.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ashvardanian";
repo = "stringzilla";
tag = "v${version}";
hash = "sha256-8HcX0P/PCaJAV333oSYZJ6xVKwYet/CF8vnEe9/dMo4=";
hash = "sha256-2qmcjRNjCyErzwto2DqdDU9NX4+hqeibhDM85c81TgU=";
};
build-system = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1297";
version = "3.0.1298";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
hash = "sha256-8EVqWhS814OwmG8nebKgGsAmn4aoKMCYBBU26tOyuj4=";
hash = "sha256-0JDCfoQqw7u1Sxmwvol7CHF55U4hfkS69/c63ZSRltE=";
};
build-system = [ setuptools ];

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "tesla-fleet-api";
version = "0.9.4";
version = "0.9.5";
pyproject = true;
disabled = pythonOlder "3.10";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Teslemetry";
repo = "python-tesla-fleet-api";
tag = "v${version}";
hash = "sha256-BfVpFTWF6s3tyW0tnfvqkS3+w72vv1YHYpYNj3cC0LA=";
hash = "sha256-45EfV6lqhOn8sorhyzUBKOj6xtd9OzYxB7SLK07IQ08=";
};
build-system = [ setuptools ];

View file

@ -32,19 +32,19 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "18.7";
version = "18.8.2";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
hash = "sha256-mOXD7lEggFus+TBZ5042QALu4PhHRBntnChQFnHu6Dw=";
hash = "sha256-+X56o8s9kbNxufDeQVLAaVG8jxcSTFVssn1HnxIHhZQ=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
hash = "sha256-zug7MzxqGhlmm6ZeRo+3ldwmFEn5cVCb+nvRzomFrnc=";
hash = "sha256-b1JOj8p5+Q2SvmbBvLxGFPCLALcOc4mAdegPCsMnNqc=";
};
nativeBuildInputs = [

View file

@ -58,7 +58,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-battery";
rev = "f8b8e8451990365e0c98c38c184962e4f83b793b";
sha256 = "1bhdzsx3kdjqjmm1q4j8937lrpkzf71irr3fqhdbddsghwrrmwim";
hash = "sha256-NfKaM4dPt7YaxG7kHMNxf95Mz0hIEhxqlVi2Obr+Da4=";
};
};
@ -69,7 +69,7 @@ in rec {
owner = "NHDaly";
repo = "tmux-better-mouse-mode";
rev = "aa59077c635ab21b251bd8cb4dc24c415e64a58e";
sha256 = "06346ih3hzwszhkj25g4xv5av7292s6sdbrdpx39p0n3kgf5mwww";
hash = "sha256-nPNa3JvDgptGvy2vpo0WSZytyu7kFSEn/Jp/OGA0ZBg=";
};
rtpFilePath = "scroll_copy_mode.tmux";
meta = {
@ -117,7 +117,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-continuum";
rev = "fc2f31d79537a5b349f55b74c8ca69abaac1ddbb";
sha256 = "06i1jp83iybw76raaxciqz9a7ypgpkvbyjn6jjap8jpqfmj2wmjb";
hash = "sha256-S1YuZHX4SnSVlMZKv/a87/qj0seRdaWyOXz5ONCVIRo=";
};
meta = {
homepage = "https://github.com/tmux-plugins/tmux-continuum";
@ -169,7 +169,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-copycat";
rev = "77ca3aab2aed8ede3e2b941079b1c92dd221cf5f";
sha256 = "1bchwzhai8k5rk32n4lrmh56rw944jqxr8imjk74hyaa7bbn81ds";
hash = "sha256-ugVk1zpKeUjOlDWi3LEkJPFsCqyZEivGzGWiqODnkK0=";
};
};
@ -180,7 +180,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-cpu";
rev = "98d787191bc3e8f19c3de54b96ba1caf61385861";
sha256 = "sha256-ymmCI6VYvf94Ot7h2GAboTRBXPIREP+EB33+px5aaJk=";
hash = "sha256-ymmCI6VYvf94Ot7h2GAboTRBXPIREP+EB33+px5aaJk=";
};
};
@ -191,7 +191,7 @@ in rec {
owner = "eraserhd";
repo = "tmux-ctrlw";
rev = "v${version}";
sha256 = "1kv5pqfjczd6z7i9jf6j5xmcai50l9bn5p2p1w1l5fi6cj8cz1k1";
hash = "sha256-YYbPkGQmukIDD1fcYleioETFai/SOJni+aZ9Jh2+Zc8=";
};
};
@ -220,7 +220,7 @@ in rec {
owner = "laktak";
repo = "extrakto";
rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2";
sha256 = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk=";
hash = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];
buildInputs = [ pkgs.python3 ];
@ -252,7 +252,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-fpp";
rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e";
sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws";
hash = "sha256-mhf1PPlo7AaAx7haRDgS+LYW7eFCOB6LPtHF76rRCa0=";
};
postInstall = ''
sed -i -e 's|fpp |${pkgs.fpp}/bin/fpp |g' $target/fpp.tmux
@ -266,7 +266,7 @@ in rec {
owner = "roosta";
repo = "tmux-fuzzback";
rev = "bfd9cf0ef1c35488f0080f0c5ca4fddfdd7e18ec";
sha256 = "w788xDBkfiLdUVv1oJi0YikFPqVk6LiN6PDfHu8on5E=";
hash = "sha256-w788xDBkfiLdUVv1oJi0YikFPqVk6LiN6PDfHu8on5E=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''
@ -311,7 +311,7 @@ in rec {
owner = "egel";
repo = "tmux-gruvbox";
rev = "3f9e38d7243179730b419b5bfafb4e22b0a969ad";
sha256 = "1l0kq77rk3cbv0rvh7bmfn90vvqqmywn9jk6gbl9mg3qbynq5wcf";
hash = "sha256-jvGCrV94vJroembKZLmvGO8NknV1Hbgz2IuNmc/BE9A=";
};
};
@ -323,7 +323,7 @@ in rec {
owner = "schasse";
repo = "tmux-jump";
rev = "416f613d3eaadbe1f6f9eda77c49430527ebaffb";
sha256 = "1xbzdyhsgaq2in0f8f491gwjmx6cxpkf2c35d2dk0kg4jfs505sz";
hash = "sha256-XxdQtJPkTTCbaGUw4ebtzPQq+QuJOOSAjQKrp6Fvf/U=";
};
postInstall = ''
sed -i -e 's|ruby|${pkgs.ruby}/bin/ruby|g' $target/scripts/tmux-jump.sh
@ -344,7 +344,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-logging";
rev = "b085ad423b5d59a2c8b8d71772352e7028b8e1d0";
sha256 = "0p0sawysalhi8k2a5hdxniqx6kb24kd8rnvfzkjqigzid5ik37js";
hash = "sha256-Wp4xY2nxv4jl/G7bjNokYk3TcbS9waLERBFSpT1XGlw=";
};
};
@ -355,7 +355,7 @@ in rec {
owner = "MunifTanjim";
repo = "tmux-mode-indicator";
rev = "11520829210a34dc9c7e5be9dead152eaf3a4423";
sha256 = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4=";
hash = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4=";
};
meta = with lib; {
homepage = "https://github.com/MunifTanjim/tmux-mode-indicator";
@ -373,7 +373,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-net-speed";
rev = "58abb615971cb617821e2e7e41c660334f55a92d";
sha256 = "1aj06gdhzcxsydjzf21n9kyxigwf38kh2rg8hh7gnjk260ydqlrc";
hash = "sha256-LFPcPDBiSvsOhOhlAScajr/Y/Uw2CPdl87qzD9szQKo=";
};
};
@ -409,7 +409,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-maildir-counter";
rev = "9415f0207e71e37cbd870c9443426dbea6da78b9";
sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4";
hash = "sha256-RFdnF/ScOPoeVgGXWhQs28tS7CmsRA0DyFyutCPEmzc=";
};
};
@ -420,7 +420,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-online-status";
rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312";
sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r";
hash = "sha256-OQW2WcNDVBMgX5IIlykn7f1wI8miXuqLQTlqsdHbw8M=";
};
};
@ -431,7 +431,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-open";
rev = "cedb4584908bd8458fadc8d3e64101d3cbb48d46";
sha256 = "10s0xdhmg0dhpj13ybcq72pw3xgb2dq5v5h2mwidzqyh9g17wndh";
hash = "sha256-sFl+wkvQ498irwKWXXAT6/XBrziYLT+CvLCBV2HrQIM=";
};
};
@ -443,7 +443,7 @@ in rec {
owner = "odedlaz";
repo = "tmux-onedark-theme";
rev = "3607ef889a47dd3b4b31f66cda7f36da6f81b85c";
sha256 = "19jljshwp2p83b634cd1mw69091x42jj0dg40ipw61qy6642h2m5";
hash = "sha256-pQooiDEeB8NvBOQ1IKUgPSSQDK+hMTLMGuiKy6GWVKY=";
};
};
@ -454,7 +454,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-pain-control";
rev = "2db63de3b08fc64831d833240749133cecb67d92";
sha256 = "0w7a6n4n86ysiqcqj12j2hg9r5fznvbp3dz8pzas9q1k3avlk0zk";
hash = "sha256-84NJtxoz4KTVv+i3cde235WcHhRSBIkZjtobZIk16nA=";
};
};
@ -466,7 +466,7 @@ in rec {
owner = "rafi";
repo = "tmux-pass";
rev = "76b1c98911d56928063a41bc93a2d9e81818ef4c";
sha256 = "sha256-bamz4IZrozo5R7jt+z7YKyrogawPqsZ9cTJi9osjVoA=";
hash = "sha256-bamz4IZrozo5R7jt+z7YKyrogawPqsZ9cTJi9osjVoA=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];
@ -494,7 +494,7 @@ in rec {
owner = "eraserhd";
repo = "tmux-plumb";
rev = "v${version}";
sha256 = "1c6k4fdl0az9811r6k164mgd4w5la75xr6x7nabmy046xc0z5i2r";
hash = "sha256-WcTyAeuGAF+Xsqeb3MtRtHDSXiUmTJNDQOkrQJsj07A=";
};
postInstall = ''
sed -i -e 's,9 plumb,${pkgs.plan9port}/bin/9 plumb,' $target/scripts/plumb
@ -526,7 +526,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-prefix-highlight";
rev = "15acc6172300bc2eb13c81718dc53da6ae69de4f";
sha256 = "08rkflfnynxgv2s26b33l199h6xcqdfmlqbyqa1wkw7h85br3dgl";
hash = "sha256-9LWRV0Hw8MmDwn5hWl3DrBuYUqBjLCO02K9bbx11MyM=";
};
};
@ -537,7 +537,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-resurrect";
rev = "ca6468e2deef11efadfe3a62832ae67742505432";
sha256 = "0d7jg5dy4jq64679rf2zqmqbvgiqvpcj5jxfljk7d7y86dnqhj3n";
hash = "sha256-dkiIbTPIn3ampK7LItndOL69cMVfuJyOIQZL4lt58jQ=";
};
meta = {
homepage = "https://github.com/tmux-plugins/tmux-resurrect";
@ -575,7 +575,7 @@ in rec {
owner = "rose-pine";
repo = "tmux";
rev = "dd6d01338ac4afeb96542dcf24e4a7fe179b69e6";
sha256 = "sha256-Tccb4VjdotOSw7flJV4N0H4557NxRhXiCecZBPU9ICQ=";
hash = "sha256-Tccb4VjdotOSw7flJV4N0H4557NxRhXiCecZBPU9ICQ=";
};
meta = {
homepage = "https://github.com/rose-pine/tmux";
@ -591,7 +591,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-sensible";
rev = "25cb91f42d020f675bb0a2ce3fbd3a5d96119efa";
sha256 = "sha256-sw9g1Yzmv2fdZFLJSGhx1tatQ+TtjDYNZI5uny0+5Hg=";
hash = "sha256-sw9g1Yzmv2fdZFLJSGhx1tatQ+TtjDYNZI5uny0+5Hg=";
};
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
@ -606,7 +606,7 @@ in rec {
owner = "27medkamal";
repo = "tmux-session-wizard";
rev = "V${version}";
sha256 = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw=";
hash = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw=";
};
meta = with lib; {
homepage = "https://github.com/27medkamal/tmux-session-wizard";
@ -640,7 +640,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-sessionist";
rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89";
sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4";
hash = "sha256-hFNrdbhmBUAyJ73RCG4RILzJ3LHIYiuNYGsqJGsVGAw=";
};
};
@ -651,7 +651,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-sidebar";
rev = "aacbdb45bc5ab69db448a72de4155d0b8dbac677";
sha256 = "1bp90zbv19kbbiik0bgb893ybss1jqsnk3353a631993xjwsih7c";
hash = "sha256-7MCouewjpTCMGmWMaTWWQevlR0LrLTBjXGumsNcH6a4=";
};
};
@ -662,7 +662,7 @@ in rec {
owner = "samoshkin";
repo = "tmux-plugin-sysstat";
rev = "29e150f403151f2341f3abcb2b2487a5f011dd23";
sha256 = "013mv9p6r2r0ls3p60l8hdad4hm8niv3wr27vgm925gxmibi4hyq";
hash = "sha256-2EMSV6z9FZHq20dkPna0qELSVIOIAnOHpiCLbG7adQQ=";
};
};
@ -673,7 +673,7 @@ in rec {
owner = "jabirali";
repo = "tmux-tilish";
rev = "22f7920837d827dc6cb31143ea916afa677c24c1";
sha256 = "wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo=";
hash = "sha256-wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo=";
};
meta = with lib; {
@ -711,7 +711,7 @@ in rec {
owner = "seebi";
repo = "tmux-colors-solarized";
rev = "e5e7b4f1af37f8f3fc81ca17eadee5ae5d82cd09";
sha256 = "1l3i82abzi4b395cgdsjg7lcfaq15kyyhijwvrgchzxi95z3hl4x";
hash = "sha256-nVA4fkmxf8he3lxG6P0sASvH6HlSt8dKGovEv5RAcdA=";
};
};
@ -803,7 +803,7 @@ in rec {
owner = "joshmedeski";
repo = "t-smart-tmux-session-manager";
rev = "v${version}";
sha256 = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc=";
hash = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''
@ -824,7 +824,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-urlview";
rev = "b84c876cffdd22990b4ab51247e795cbd7813d53";
sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn";
hash = "sha256-1oEJDgHPIM6AEVlGcavRqP2YjPdmkxHHMiFYdgqW5Mo=";
};
postInstall = ''
sed -i -e '14,20{s|extract_url|${pkgs.extract_url}/bin/extract_url|g}' $target/urlview.tmux
@ -838,7 +838,7 @@ in rec {
owner = "tmux-plugins";
repo = "vim-tmux-focus-events";
rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941";
sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1";
hash = "sha256-ITZMu2q80deOf0zqgYJDDgWQHWhJEzZlK6lVFPY4FIw=";
};
meta = with lib; {
@ -889,7 +889,7 @@ in rec {
owner = "tmux-plugins";
repo = "tmux-yank";
rev = "acfd36e4fcba99f8310a7dfb432111c242fe7392";
sha256 = "sha256-/5HPaoOx2U2d8lZZJo5dKmemu6hKgHJYq23hxkddXpA=";
hash = "sha256-/5HPaoOx2U2d8lZZJo5dKmemu6hKgHJYq23hxkddXpA=";
};
};
@ -901,7 +901,7 @@ in rec {
owner = "o0th";
repo = "tmux-nova";
rev = "v${version}";
sha256 = "16llz3nlyw88lyd8mmj27i0ncyhpfjj5c1yikngf7nxcqsbjmcnh";
hash = "sha256-0LIql8as2+OendEHVqR0F3pmQTxC1oqapwhxT+34lJo=";
};
meta = with lib; {
homepage = "https://github.com/o0th/tmux-nova";

View file

@ -29,6 +29,10 @@
bubblewrap,
autoconf,
gnupg,
# Disable the unshare RPM plugin, which can be useful if
# RPM is ran within the Nix sandbox.
disableUnshare ? true,
}:
stdenv.mkDerivation rec {
@ -112,6 +116,9 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DWITH_LIBELF=OFF"
"-DWITH_LIBDW=OFF"
]
++ lib.optionals disableUnshare [
"-DHAVE_UNSHARE=OFF"
];
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements

View file

@ -1946,10 +1946,6 @@ with pkgs;
buildGoModule = buildGo123Module;
};
authoscope = callPackage ../tools/security/authoscope {
inherit (darwin.apple_sdk.frameworks) Security;
};
avahi = callPackage ../development/libraries/avahi { };
avahi-compat = callPackage ../development/libraries/avahi {

View file

@ -452,6 +452,7 @@ mapAliases ({
pushbullet = pushbullet-py; # Added 2022-10-15
Pweave = pweave; # added 2023-02-19
pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13
py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23
py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07
py_stringmatching = py-stringmatching; # added 2023-11-12
py17track = throw "py17track was removed because Home Assistant switched to pyseventeentrack"; # added 2024-08-08

View file

@ -11277,8 +11277,6 @@ self: super: with self; {
py3status = callPackage ../development/python-modules/py3status { };
py3to2 = callPackage ../development/python-modules/3to2 { };
py4j = callPackage ../development/python-modules/py4j { };
pyacaia-async = callPackage ../development/python-modules/pyacaia-async { };
@ -15541,6 +15539,8 @@ self: super: with self; {
stopit = callPackage ../development/python-modules/stopit { };
stop-words = callPackage ../development/python-modules/stop-words { };
stransi = callPackage ../development/python-modules/stransi { };
strategies = callPackage ../development/python-modules/strategies { };