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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2025-01-12 06:05:14 +00:00
committed by GitHub
parent abfd150a73 e930b19aca
commit 974ffaf1c0
35 changed files with 319 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
-6
View File
@@ -11068,12 +11068,6 @@
github = "johnpyp";
githubId = 20625636;
};
johnramsden = {
email = "johnramsden@riseup.net";
github = "johnramsden";
githubId = 8735102;
name = "John Ramsden";
};
johnrichardrinehart = {
email = "johnrichardrinehart@gmail.com";
github = "johnrichardrinehart";
nixos/modules/programs/tmux.nix
+4 -1
View File
@@ -8,6 +8,7 @@
let
inherit (lib)
mkOption
mkPackageOption
mkIf
types
optionalString
@@ -87,6 +88,8 @@ in
relatedPackages = [ "tmux" ];
};
package = mkPackageOption pkgs "tmux" { };
aggressiveResize = mkOption {
default = false;
type = types.bool;
@@ -224,7 +227,7 @@ in
environment = {
etc."tmux.conf".text = tmuxConf;
systemPackages = [ pkgs.tmux ] ++ cfg.plugins;
systemPackages = [ cfg.package ] ++ cfg.plugins;
variables = {
TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/$(id -u)"}'';
pkgs/applications/backup/timeshift/unwrapped.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "timeshift";
version = "24.06.5";
version = "24.06.6";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "timeshift";
rev = version;
hash = "sha256-2qNLgUZLMcfoemdLvvjdkR7Ln5loSKGqbd402y5Id8k=";
hash = "sha256-umMekxP9bvV01KzfIh2Zxa9Xb+tR5x+tG9dOnBIOkjY=";
};
patches = [
pkgs/by-name/bu/buck2/hashes.json
+8 -4
View File
@@ -1,7 +1,11 @@
{ "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh"
, "_prelude": "sha256-o/YUIu8vuIIk2kfkMaijZNVLqwELwum4mFJ9sbqnDIs="
, "x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo="
, "x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E="
, "aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs="
, "aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M="
, "buck2-x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo="
, "rust-project-x86_64-linux": "sha256-UbC43xyEIIT76K2OHnp4lBo3saoTeuZxYDRieEry+tE="
, "buck2-x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E="
, "rust-project-x86_64-darwin": "sha256-mp8xR4bFb9esN3QABG03H07t09caMNQLKOqxdg8+CEw="
, "buck2-aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs="
, "rust-project-aarch64-linux": "sha256-rwT6mO0lyRnyCfdUtYcdelJArHZCHP6K/A//n+yLtgA="
, "buck2-aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M="
, "rust-project-aarch64-darwin": "sha256-JYQiCEcplVHTK2iPLDBpGyyoMXU5B0/P/r8VCN1IDko="
}
pkgs/by-name/bu/buck2/package.nix
+33 -18
View File
@@ -46,24 +46,34 @@ let
# our version of buck2; this should be a git tag
version = "2025-01-02";
# map our platform name to the rust toolchain suffix
# NOTE (aseipp): must be synchronized with update.sh!
platform-suffix =
{
x86_64-darwin = "x86_64-apple-darwin";
aarch64-darwin = "aarch64-apple-darwin";
x86_64-linux = "x86_64-unknown-linux-musl";
aarch64-linux = "aarch64-unknown-linux-musl";
}
."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
# the platform-specific, statically linked binary — which is also
# zstd-compressed
src =
buck2-src =
let
suffix =
{
# map our platform name to the rust toolchain suffix
# NOTE (aseipp): must be synchronized with update.sh!
x86_64-darwin = "x86_64-apple-darwin";
aarch64-darwin = "aarch64-apple-darwin";
x86_64-linux = "x86_64-unknown-linux-musl";
aarch64-linux = "aarch64-unknown-linux-musl";
}
."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
name = "buck2-${version}-${platform-suffix}.zst";
hash = buildHashes."buck2-${stdenv.hostPlatform.system}";
url = "https://github.com/facebook/buck2/releases/download/${version}/buck2-${platform-suffix}.zst";
in
fetchurl { inherit name url hash; };
name = "buck2-${version}-${suffix}.zst";
hash = buildHashes."${stdenv.hostPlatform.system}";
url = "https://github.com/facebook/buck2/releases/download/${version}/buck2-${suffix}.zst";
# rust-project, which is used to provide IDE integration Buck2 Rust projects,
# is part of the official distribution
rust-project-src =
let
name = "rust-project-${version}-${platform-suffix}.zst";
hash = buildHashes."rust-project-${stdenv.hostPlatform.system}";
url = "https://github.com/facebook/buck2/releases/download/${version}/rust-project-${platform-suffix}.zst";
in
fetchurl { inherit name url hash; };
@@ -83,7 +93,11 @@ in
stdenv.mkDerivation {
pname = "buck2";
version = "unstable-${version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made
inherit src;
srcs = [
buck2-src
rust-project-src
];
sourceRoot = ".";
nativeBuildInputs = [
installShellFiles
@@ -94,12 +108,13 @@ stdenv.mkDerivation {
dontConfigure = true;
dontStrip = true;
unpackPhase = "unzstd ${src} -o ./buck2";
buildPhase = "chmod +x ./buck2";
checkPhase = "./buck2 --version";
unpackPhase = "unzstd ${buck2-src} -o ./buck2 && unzstd ${rust-project-src} -o ./rust-project";
buildPhase = "chmod +x ./buck2 && chmod +x ./rust-project";
checkPhase = "./buck2 --version && ./rust-project --version";
installPhase = ''
mkdir -p $out/bin
install -D buck2 $out/bin/buck2
install -D rust-project $out/bin/rust-project
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd buck2 \
pkgs/by-name/bu/buck2/update.sh
+6 -1
View File
@@ -36,7 +36,12 @@ for arch in "${ARCHS[@]}"; do
IFS=: read -r arch_name arch_target <<< "$arch"
sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/buck2-${arch_target}.zst")"
srihash="$(nix hash to-sri --type sha256 "$sha256hash")"
echo ", \"$arch_name\": \"$srihash\"" >> "$HFILE"
echo ", \"buck2-$arch_name\": \"$srihash\"" >> "$HFILE"
IFS=: read -r arch_name arch_target <<< "$arch"
sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/rust-project-${arch_target}.zst")"
srihash="$(nix hash to-sri --type sha256 "$sha256hash")"
echo ", \"rust-project-$arch_name\": \"$srihash\"" >> "$HFILE"
done
echo "}" >> "$HFILE"
pkgs/by-name/ci/cinnamon-common/package.nix
+2 -2
View File
@@ -76,13 +76,13 @@ in
# TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "6.4.3";
version = "6.4.6";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-Nq4CFLmvgyPFg+mALE1UYauWAR7ZjtJGJOSChbIjm4g=";
hash = "sha256-hvQINRvEqTDWV0ja1tHzkpJMexc0htL0IlCHuy8QCQk=";
};
patches = [
pkgs/by-name/fo/folder-color-switcher/package.nix
+3 -3
View File
@@ -8,14 +8,14 @@
stdenvNoCC.mkDerivation rec {
pname = "folder-color-switcher";
version = "1.6.6";
version = "1.6.7";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
# They don't really do tags, this is just a named commit.
rev = "208e66285ec33a078205a221af579c79bc8cad01";
hash = "sha256-t38eEFgbrFsZ+vy+axIeL8j6todPLg4NqS6DM20iIxQ=";
rev = "5bd94d3ffdb9585c09832f0beabb14f0e67e8d58";
hash = "sha256-77+b7yVcTvBjtmXGOUIrh88IaxvCiBNM+hbZoN0+zoI=";
};
nativeBuildInputs = [
pkgs/by-name/ga/garnet/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "garnet";
version = "1.0.48";
version = "1.0.50";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
tag = "v${version}";
hash = "sha256-L+yML0VgD+rTReRurfH78U4uXZJWOW4mE+dmBQRbb9U=";
hash = "sha256-jmEPgGO9kQvzyGktFfsyEZdHlgJOZokzE3d5Xneu6/E=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
pkgs/by-name/ma/macskk/package.nix
+59
View File
@@ -0,0 +1,59 @@
{
lib,
stdenvNoCC,
fetchurl,
_7zz,
cpio,
xar,
darwin,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "macskk";
version = "1.4.1";
src = fetchurl {
url = "https://github.com/mtgto/macSKK/releases/download/${finalAttrs.version}/macSKK-${finalAttrs.version}.dmg";
hash = "sha256-lLIFVGwt3VDsXRRGczY5VeqUyUgkX+G9tB3SGrO0voM=";
};
nativeBuildInputs = [
_7zz
cpio
xar
] ++ lib.optionals stdenvNoCC.hostPlatform.isAarch64 [ darwin.autoSignDarwinBinariesHook ];
unpackPhase = ''
runHook preUnpack
7zz x $src
xar -xf macSKK-${finalAttrs.version}.pkg
cat app.pkg/Payload | gunzip -dc | cpio -i
cat dict.pkg/Payload | gunzip -dc | cpio -i
runHook postUnpack
'';
installPhase = ''
runHook preInstall
mkdir -p "$out"/Library/{Containers,Input\ Methods}
mkdir -p "$out/bin"
cp -a "Library/Input Methods/macSKK.app" "$out/Library/Input Methods/"
cp -a "Library/Containers/net.mtgto.inputmethod.macSKK" "$out/Library/Containers/"
ln -s "$out/Library/Input Methods/macSKK.app/Contents/MacOS/macSKK" "$out/bin/macSKK"
runHook postInstall
'';
meta = {
description = "Yet Another macOS SKK Input Method";
homepage = "https://github.com/mtgto/macSKK";
changelog = "https://github.com/mtgto/macSKK/blob/${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ wattmto ];
platforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "macSKK";
};
})
pkgs/by-name/mi/mint-artwork/package.nix
+3 -3
View File
@@ -8,14 +8,14 @@
stdenv.mkDerivation rec {
pname = "mint-artwork";
version = "1.8.4";
version = "1.8.9";
src = fetchurl {
urls = [
"http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20240707114553/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20250111022232/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
];
hash = "sha256-DpRoGTVB1vaif4UNiCEaVO/pyQY8Hc/QG1vmYkVr3Iw=";
hash = "sha256-MKXKne3wqxfIqmOawpmZbX/NRVSA5fBetpSE+mr/eqA=";
};
nativeBuildInputs = [
pkgs/by-name/mi/mint-themes/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-themes";
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-97H2gVSZh0azl2ui4iWsNqgKzkBXRo6Daza2XtRdqII=";
hash = "sha256-QCf0hF1qtTiYo9F/M3UiCrGj6EPSrrSWZaLXqH0UNWs=";
};
nativeBuildInputs = [
pkgs/by-name/mp/mpack/CVE-2011-4919.patch
-23
View File
@@ -1,23 +0,0 @@
commit 0c87201f64491575350b18d04c62ec142e119d1f
Author: Sebastian Pipping <sebastian@pipping.org>
Date: Sat, 31 Dec 2011 19:17:20 +0000 (20:17 +0100)
Source: https://web.archive.org/web/20120128080247/http://git.goodpoint.de/?p=mpack.git;a=commitdiff;h=0c87201f64491575350b18d04c62ec142e119d1f
Fix permissions
diff --git a/unixos.c b/unixos.c
index fa6d0a7..0e2f469 100644 (file)
--- a/unixos.c
+++ b/unixos.c
@@ -134,9 +134,9 @@ FILE *os_createnewfile(char *fname)
FILE *ret;
#ifdef O_EXCL
- fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0644);
+ fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0600);
#else
- fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0644);
+ fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
#endif
if (fd == -1)
pkgs/by-name/mp/mpack/build-fix.patch
-29
View File
@@ -1,29 +0,0 @@
diff -ubr mpack-1.6-orig/unixos.c mpack-1.6/unixos.c
--- mpack-1.6-orig/unixos.c 2013-08-17 14:32:38.102772775 +0200
+++ mpack-1.6/unixos.c 2013-08-17 14:32:43.180792505 +0200
@@ -38,10 +38,6 @@
#define MAXHOSTNAMELEN 64
#endif
-extern int errno;
-extern char *malloc();
-extern char *getenv();
-
int overwrite_files = 0;
int didchat;
Only in mpack-1.6: unixos.o
Only in mpack-1.6: unixunpk.o
Only in mpack-1.6: uudecode.o
diff -ubr mpack-1.6-orig/xmalloc.c mpack-1.6/xmalloc.c
--- mpack-1.6-orig/xmalloc.c 2013-08-17 14:32:38.102772775 +0200
+++ mpack-1.6/xmalloc.c 2013-08-17 14:33:08.900892319 +0200
@@ -24,7 +24,6 @@
*/
#include <stdio.h>
#include <string.h>
-extern char *malloc(), *realloc();
char *xmalloc (int size)
{
Only in mpack-1.6: xmalloc.o
pkgs/by-name/mp/mpack/package.nix
+55 -12
View File
@@ -2,6 +2,8 @@
lib,
stdenv,
fetchurl,
fetchpatch,
autoreconfHook,
testers,
mpack,
}:
@@ -15,23 +17,64 @@ stdenv.mkDerivation rec {
hash = "sha256-J0EIuzo5mCpO/BT7OmUpjmbI5xNnw9q/STOBYtIHqUw=";
};
patches = [
./build-fix.patch
./sendmail-via-execvp.diff
./CVE-2011-4919.patch
];
patches =
let
# https://salsa.debian.org/debian/mpack/-/tree/7d6514b314a7341614ec8275b03acfcb6a854a6f/debian/patches
fetchDebPatch =
{ name, hash }:
fetchpatch {
inherit name hash;
url = "https://salsa.debian.org/debian/mpack/-/raw/7d6514b314a7341614ec8275b03acfcb6a854a6f/debian/patches/${name}";
};
in
[
./sendmail-via-execvp.diff
]
++ (map fetchDebPatch [
{
name = "01_legacy.patch";
hash = "sha256-v2pZUXecgxJqoHadBhpAAoferQNSeYE+m7qzEiggeO4=";
}
{
name = "02_fix-permissions.patch";
hash = "sha256-sltnIqgv7+pwwSFQRCDeCwnjoo2OrvmGFm+SM9U/HB4=";
}
{
name = "03_specify-filename-replacement-character.patch";
hash = "sha256-vmLIGFSqKK/qSsltzhdLQGoekew3r25EwAu56umeXlU=";
}
{
name = "04_fix-return-error-code.patch";
hash = "sha256-l23D6xhkgtkEsErzUy/q6U3aPf5N7YUw2PEToU1YXKI=";
}
{
name = "06_fix-makefile.patch";
hash = "sha256-69plDqy2sLzO1O4mqjJIlTRCw5ZeVySiqwo93ZkX3Ho=";
}
{
name = "07_fix-decode-base64-attachment.patch";
hash = "sha256-hzSCrEg0j6dJNLbfwRNn+rWGRnyUBLjJUlORJS9aDD4=";
}
{
name = "08_fix-mime-version.patch";
hash = "sha256-l2rBqbyKmnz5tEPeuX6HCqw7rSV8pDb7ijpCHsdh57g=";
}
{
name = "09_remove-debugging-message.patch";
hash = "sha256-dtq6BHgH4ciho0+TNW/rU3KWoeKs/1jwJafnHTr9ebI=";
}
]);
postPatch = ''
for f in *.{c,man,pl,unix} ; do
substituteInPlace $f --replace /usr/tmp /tmp
done
substituteInPlace *.{c,man,pl,unix} --replace-quiet /usr/tmp /tmp
# this just shuts up some warnings
for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do
sed -i 'i#include <stdlib.h>' $f
done
# silence a buffer overflow warning
substituteInPlace uudecode.c \
--replace-fail "char buf[1024], buf2[1024];" "char buf[1024], buf2[1066];"
'';
nativeBuildInputs = [ autoreconfHook ];
postInstall = ''
install -Dm644 -t $out/share/doc/mpack INSTALL README.*
'';
pkgs/by-name/mu/music-assistant/package.nix
+2
View File
@@ -63,7 +63,9 @@ python.pkgs.buildPythonApplication rec {
"cryptography"
"mashumaro"
"orjson"
"pillow"
"xmltodict"
"zeroconf"
];
dependencies =
pkgs/by-name/ni/niri/package.nix
+7 -3
View File
@@ -24,13 +24,13 @@
rustPlatform.buildRustPackage rec {
pname = "niri";
version = "0.1.10.1";
version = "25.01";
src = fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
tag = "v${version}";
hash = "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=";
hash = "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=";
};
postPatch = ''
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-2hFavY3Y6aBPjo53o7GMjuvUKOcj+ZQiV0M1mpoH/Ck=";
cargoHash = "sha256-eGI3i7FnjZGEfcGvEpNLOog8cgExBJuGoXM/oHsui0M=";
strictDeps = true;
@@ -102,6 +102,10 @@ rustPlatform.buildRustPackage rec {
);
};
preCheck = ''
export XDG_RUNTIME_DIR=$(mktemp -d)
'';
passthru = {
providedSessions = [ "niri" ];
updateScript = nix-update-script { };
pkgs/by-name/on/onboard/package.nix
+1 -1
View File
@@ -191,7 +191,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
homepage = "https://launchpad.net/onboard";
description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users";
maintainers = with maintainers; [ johnramsden ];
maintainers = with maintainers; [ ];
license = licenses.gpl3;
};
}
pkgs/by-name/pd/pdm/package.nix
+3 -2
View File
@@ -24,7 +24,7 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "pdm";
version = "2.22.1";
version = "2.22.2";
pyproject = true;
disabled = python.pkgs.pythonOlder "3.8";
@@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec {
owner = "pdm-project";
repo = "pdm";
tag = version;
hash = "sha256-khAS/OpuvZTJGh9/lIGtKONajIonCwc/M9D9lSwzFvw=";
hash = "sha256-se0Xvziyg4CU6wENO0oYVAI4f2uBv3Ubadiptf/uPgQ=";
};
pythonRelaxDeps = [ "hishel" ];
@@ -117,6 +117,7 @@ python.pkgs.buildPythonApplication rec {
"test_lock_all_with_excluded_groups"
"test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV"
"test_build_distributions"
"test_init_project_respect"
];
__darwinAllowLocalNetworking = true;
pkgs/by-name/pi/pix/package.nix
+2 -2
View File
@@ -34,13 +34,13 @@
stdenv.mkDerivation rec {
pname = "pix";
version = "3.4.4";
version = "3.4.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-BasS0Z8fj7vxFnMZ6KOd5LkvSvTaw6+DDfcRFrdus7A=";
hash = "sha256-c/+NQHvscW/XE49Twmg1Rk1IfsjReCtRQWffobZtgTs=";
};
nativeBuildInputs = [
pkgs/by-name/st/sticky/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "sticky";
version = "1.23";
version = "1.24";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-vNS2p3cmuQB+wusx9VSi81ZyGmUYgVXlMjIMkrnvyrI=";
hash = "sha256-Mj14S4M7NMQE17SN8uED4UIJN6nwTo3E+D3j0tGKXc4=";
};
postPatch = ''
pkgs/by-name/te/television/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "television";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "alexpasmantier";
repo = "television";
tag = version;
hash = "sha256-7TsSgT6UdcGd1/yoRT0SzclEPTCYkBgPcoRMDTKHcEU=";
hash = "sha256-XMANif4WbI+imSYeQRlvZJYjtaVbKrD4wVx2mQ1HYHg=";
};
cargoHash = "sha256-Kb4vc1tCz6cxy/wpuZxowxTaUqpMHROwdiYRDIz22/I=";
cargoHash = "sha256-IXtmQdDO3OHBZALWQKhJVgEimvuNyAj0/7aUlnL395M=";
passthru = {
tests.version = testers.testVersion {
pkgs/development/libraries/onnxruntime/default.nix
+4
View File
@@ -275,5 +275,9 @@ effectiveStdenv.mkDerivation rec {
platforms = platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ puffnfresh ck3d cbourjau ];
badPlatforms = [
# error: implicit capture of 'this' with a capture default of '=' is deprecated [-Werror,-Wdeprecated-this-capture]
lib.systems.inspect.patterns.isDarwin
];
};
}
pkgs/development/python-modules/edk2-pytool-library/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "edk2-pytool-library";
version = "0.22.4";
version = "0.22.5";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "tianocore";
repo = "edk2-pytool-library";
tag = "v${version}";
hash = "sha256-uTXE5b9iqGhrkbevz6GIw4MMDh3yA4Op0JHCTRo0ZfY=";
hash = "sha256-cnJTDMlkegd21X1meNTbS57y4qPYR+JkRtiTPof+PiQ=";
};
build-system = [
pkgs/development/python-modules/faster-whisper/default.nix
+2 -2
View File
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "faster-whisper";
version = "1.1.0";
version = "1.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "SYSTRAN";
repo = "faster-whisper";
tag = "v${version}";
hash = "sha256-oJBCEwTfon80XQ9XIgnRw0SLvpwX0L5jnezwG0jv3Eg=";
hash = "sha256-1j0ZNQY+P7ZflFCxKkFncJl7Rwuf3AMhzsS6CO9uLD0=";
};
build-system = [
pkgs/development/python-modules/lazr/config.nix → pkgs/development/python-modules/lazr-config/default.nix
+10 -10
View File
@@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchgit,
setuptools,
lazr-delegates,
zope-interface,
@@ -10,18 +10,18 @@
buildPythonPackage rec {
pname = "lazr-config";
version = "3.0";
version = "3.1";
pyproject = true;
src = fetchPypi {
pname = "lazr.config";
inherit version;
hash = "sha256-oU5PbMCa68HUCxdhWK6g7uIlLBQAO40O8LMcfFFMNkQ=";
src = fetchgit {
url = "https://git.launchpad.net/lazr.config";
rev = "3c659114e8e947fbd46954336f5577351d786de9";
hash = "sha256-eYJY4JRoqTMG4j1jyiYrI8xEKdJ+wQYVVU/6OqVIodk=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
lazr-delegates
zope-interface
];
@@ -38,10 +38,10 @@ buildPythonPackage rec {
pythonNamespaces = [ "lazr" ];
meta = with lib; {
meta = {
description = "Create configuration schemas, and process and validate configurations";
homepage = "https://launchpad.net/lazr.config";
changelog = "https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=${version}";
license = licenses.lgpl3Only;
license = lib.licenses.lgpl3Only;
};
}
pkgs/development/python-modules/lazr/delegates.nix → pkgs/development/python-modules/lazr-delegates/default.nix
+7 -7
View File
@@ -9,18 +9,18 @@
buildPythonPackage rec {
pname = "lazr-delegates";
version = "2.1.0";
version = "2.1.1";
pyproject = true;
src = fetchPypi {
pname = "lazr.delegates";
pname = "lazr_delegates";
inherit version;
hash = "sha256-UNT7iHK5UuV6SOEmEOVQ+jBm7rV8bGx1tqUUJBi6wZw=";
hash = "sha256-rs6yYW5Rtz8yf78SxOwrfXZwy4IL1eT2hRIV+3lsAtw=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [ zope-interface ];
dependencies = [ zope-interface ];
pythonImportsCheck = [ "lazr.delegates" ];
@@ -28,10 +28,10 @@ buildPythonPackage rec {
pythonNamespaces = [ "lazr" ];
meta = with lib; {
meta = {
description = "Easily write objects that delegate behavior";
homepage = "https://launchpad.net/lazr.delegates";
changelog = "https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=${version}";
license = licenses.lgpl3Only;
license = lib.licenses.lgpl3Only;
};
}
pkgs/development/python-modules/lazr-restfulclient/default.nix
+12 -8
View File
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
isPy27,
fetchPypi,
distro,
httplib2,
@@ -16,17 +15,19 @@
}:
buildPythonPackage rec {
pname = "lazr.restfulclient";
pname = "lazr-restfulclient";
version = "0.14.6";
disabled = isPy27; # namespace is broken for python2
pyproject = true;
src = fetchPypi {
inherit pname version;
pname = "lazr.restfulclient";
inherit version;
hash = "sha256-Q/EqHTlIRjsUYgOMR7Qp3LXkLgun8uFlEbArpdKt/9s=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
distro
httplib2
oauthlib
@@ -46,10 +47,13 @@ buildPythonPackage rec {
pythonImportsCheck = [ "lazr.restfulclient" ];
meta = with lib; {
pythonNamespaces = [ "lazr" ];
meta = {
description = "Programmable client library that takes advantage of the commonalities among";
homepage = "https://launchpad.net/lazr.restfulclient";
license = licenses.lgpl3;
changelog = "https://git.launchpad.net/lazr.restfulclient/tree/NEWS.rst?h=${version}";
license = lib.licenses.lgpl3Plus;
maintainers = [ ];
};
}
pkgs/development/python-modules/lazr-uri/default.nix
+19 -10
View File
@@ -1,28 +1,37 @@
{
lib,
buildPythonPackage,
isPy27,
fetchPypi,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "lazr.uri";
version = "1.0.6";
disabled = isPy27; # namespace is broken for python2
pname = "lazr-uri";
version = "1.0.7";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "5026853fcbf6f91d5a6b11ea7860a641fe27b36d4172c731f4aa16b900cf8464";
pname = "lazr_uri";
inherit version;
hash = "sha256-7Qz28zPkUBFHUq+xzgwpnDasSxCQY+tQNUxPh/glo+4=";
};
propagatedBuildInputs = [ setuptools ];
build-system = [ setuptools ];
meta = with lib; {
dependencies = [ setuptools ];
pythonImportsCheck = [ "lazr.uri" ];
nativeCheckInputs = [ pytestCheckHook ];
pythonNamespaces = [ "lazr" ];
meta = {
description = "Self-contained, easily reusable library for parsing, manipulating";
homepage = "https://launchpad.net/lazr.uri";
license = licenses.lgpl3;
changelog = "https://git.launchpad.net/lazr.uri/tree/NEWS.rst?h=${version}";
license = lib.licenses.lgpl3Only;
maintainers = [ ];
};
}
pkgs/development/python-modules/standard-imghdr/default.nix
+35
View File
@@ -0,0 +1,35 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "standard-imghdr";
version = "3.13.0";
pyproject = true;
src = fetchFromGitHub {
owner = "youknowone";
repo = "python-deadlib";
tag = "v${version}";
hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg=";
};
sourceRoot = "${src.name}/imghdr";
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "imghdr" ];
meta = {
description = "Python dead batteries. See PEP 594";
homepage = "https://github.com/youknowone/python-deadlib";
license = lib.licenses.psfl;
maintainers = with lib.maintainers; [ hexa ];
};
}
pkgs/development/python-modules/tensorboard/default.nix
+2
View File
@@ -12,6 +12,7 @@
absl-py,
google-auth-oauthlib,
setuptools,
standard-imghdr,
tensorboard-data-server,
tensorboard-plugin-wit,
tensorboard-plugin-profile,
@@ -47,6 +48,7 @@ buildPythonPackage rec {
numpy
protobuf
setuptools
standard-imghdr
tensorboard-data-server
tensorboard-plugin-profile
tensorboard-plugin-wit
pkgs/development/python-modules/torch/default.nix
+3 -2
View File
@@ -87,7 +87,6 @@
# dependencies for torch.utils.tensorboard
pillow,
six,
future,
tensorboard,
protobuf,
@@ -298,6 +297,9 @@ buildPythonPackage rec {
"# Upstream: set(CUDAToolkit_ROOT"
substituteInPlace third_party/gloo/cmake/Cuda.cmake \
--replace-warn "find_package(CUDAToolkit 7.0" "find_package(CUDAToolkit"
# annotations (3.7), print_function (3.0), with_statement (2.6) are all supported
sed -i -e "/from __future__ import/d" **.py
''
+ lib.optionalString rocmSupport ''
# https://github.com/facebookincubator/gloo/pull/297
@@ -529,7 +531,6 @@ buildPythonPackage rec {
# the following are required for tensorboard support
pillow
six
future
tensorboard
protobuf
pkgs/servers/matrix-synapse/default.nix
+14
View File
@@ -10,6 +10,7 @@
rustc,
nixosTests,
callPackage,
fetchpatch2,
}:
let
@@ -34,6 +35,15 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-LGFuz3NtNqH+XumJOirvflH0fyfTtqz5qgYlJx2fmAU=";
};
patches = [
# Fixes test compat with twisted 24.11.0.
# Can be removed in next release.
(fetchpatch2 {
url = "https://github.com/element-hq/synapse/commit/3eb92369ca14012a07da2fbf9250e66f66afb710.patch";
sha256 = "sha256-VDn3kQy23+QC2WKhWfe0FrUOnLuI1YwH5GxdTTVWt+A=";
})
];
postPatch = ''
# Remove setuptools_rust from runtime dependencies
# https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185
@@ -47,6 +57,10 @@ python3.pkgs.buildPythonApplication rec {
# Don't force pillow to be 10.0.1 because we already have patched it, and
# we don't use the pillow wheels.
sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml
# https://github.com/element-hq/synapse/pull/17878#issuecomment-2575412821
substituteInPlace tests/storage/databases/main/test_events_worker.py \
--replace-fail "def test_recovery" "def no_test_recovery"
'';
nativeBuildInputs = with python3.pkgs; [
pkgs/tools/networking/lldpd/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "lldpd";
version = "1.0.18";
version = "1.0.19";
src = fetchurl {
url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
hash = "sha256-SzIGddYIkBpKDU/v+PlruEbUkT2RSwz3W30K6ASQ8vc=";
hash = "sha256-+H3zFj1eUTjakB0FWzhACXhdHrUP2xeiNDkQ/PMKmX8=";
};
configureFlags =
pkgs/top-level/python-packages.nix
+8 -6
View File
@@ -1004,7 +1004,7 @@ self: super: with self; {
audio-metadata = callPackage ../development/python-modules/audio-metadata { };
audioop-lts = callPackage ../development/python-modules/audioop-lts { };
audioop-lts = if pythonAtLeast "3.13" then callPackage ../development/python-modules/audioop-lts { } else null;
audioread = callPackage ../development/python-modules/audioread { };
@@ -7147,9 +7147,9 @@ self: super: with self; {
layoutparser = callPackage ../development/python-modules/layoutparser { };
lazr-config = callPackage ../development/python-modules/lazr/config.nix { };
lazr-config = callPackage ../development/python-modules/lazr-config { };
lazr-delegates = callPackage ../development/python-modules/lazr/delegates.nix { };
lazr-delegates = callPackage ../development/python-modules/lazr-delegates { };
lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { };
@@ -15532,11 +15532,13 @@ self: super: with self; {
stm32loader = callPackage ../development/python-modules/stm32loader { };
standard-aifc = callPackage ../development/python-modules/standard-aifc { };
standard-aifc = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-aifc { } else null;
standard-chunk = callPackage ../development/python-modules/standard-chunk { };
standard-chunk = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-chunk { } else null;
standard-telnetlib = callPackage ../development/python-modules/standard-telnetlib { };
standard-imghdr = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-imghdr { } else null;
standard-telnetlib = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-telnetlib { } else null;
stone = callPackage ../development/python-modules/stone { };